x11-libs/libdrm: Remove support for MT12 [chromiumos/overlays/chromiumos-overlay : master]

9 views
Skip to first unread message

Daniel Kurtz (Gerrit)

unread,
Jan 27, 2016, 7:27:34 AM1/27/16
to Rufus Hamade, Wu-cheng Li, Nicolas Boichat
Hello Rufus Hamade, Wu-cheng Li, Nicolas Boichat,

I'd like you to do a code review. Please visit

https://chromium-review.googlesource.com/324164

to review the following change.

Change subject: x11-libs/libdrm: Remove support for MT12
......................................................................

x11-libs/libdrm: Remove support for MT12

There is only one MTK format, MT21, there is no MT12.

Signed-off-by: Daniel Kurtz <djk...@chromium.org>

BUG=chrome-os-partner:38394
TEST=videojs.com, confirm '0' increments on chrome://histograms/Media.Gpu
CQ-DEPENDS=CL:*246225

Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
---
A
x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-format.patch
D
x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-formats.patch
A x11-libs/libdrm/libdrm-2.4.65-r1.ebuild
M x11-libs/libdrm/libdrm-2.4.65.ebuild
4 files changed, 30 insertions(+), 31 deletions(-)



diff --git
a/x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-format.patch
b/x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-format.patch
new file mode 100644
index 0000000..b106f0d
--- /dev/null
+++
b/x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-format.patch
@@ -0,0 +1,28 @@
+From 6fd50edca6372aa255c96207ea18c52a85a4724f Mon Sep 17 00:00:00 2001
+From: Daniel Kurtz <djk...@chromium.org>
+Date: Wed, 27 Jan 2016 19:49:58 +0800
+Subject: [PATCH 5/6] Add Mediatek proprietary format
+
+Add DRM_FORMAT_MT21 for Mediatek Properity video block format.
+
+Signed-off-by: Chiawen Lee <chiaw...@mediatek.com>
+---
+ include/drm/drm_fourcc.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h
+index 63a80ca..8061c01 100644
+--- a/include/drm/drm_fourcc.h
++++ b/include/drm/drm_fourcc.h
+@@ -107,6 +107,8 @@
+ #define DRM_FORMAT_NV16 fourcc_code('N', 'V', '1', '6') /* 2x1
subsampled Cr:Cb plane */
+ #define DRM_FORMAT_NV61 fourcc_code('N', 'V', '6', '1') /* 2x1
subsampled Cb:Cr plane */
+
++#define DRM_FORMAT_MT21 fourcc_code('M', 'T', '2', '1') /* Mediatek
Block Mode */
++
+ /*
+ * 3 plane YCbCr
+ * index 0: Y plane, [7:0] Y
+--
+2.7.0.rc3.207.g0ac5344
+
diff --git
a/x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-formats.patch
b/x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-formats.patch
deleted file mode 100644
index 3289967..0000000
---
a/x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-formats.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From db2a5b48c410628e5a654293b650f87391b3925a Mon Sep 17 00:00:00 2001
-From: Chiawen Lee <chiaw...@mediatek.com>
-Date: Wed, 18 Mar 2015 10:14:39 +0800
-Subject: [PATCH 5/6] Add Mediatek proprietary formats
-
-Add DRM_FORMAT_MT12 and DRM_FORMAT_MT21 for Mediatek Properity
-video block format
-
-Signed-off-by: Chiawen Lee <chiaw...@mediatek.com>
----
- include/drm/drm_fourcc.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h
-index 63a80ca..59d3f87 100644
---- a/include/drm/drm_fourcc.h
-+++ b/include/drm/drm_fourcc.h
-@@ -107,6 +107,9 @@
- #define DRM_FORMAT_NV16 fourcc_code('N', 'V', '1', '6') /* 2x1
subsampled Cr:Cb plane */
- #define DRM_FORMAT_NV61 fourcc_code('N', 'V', '6', '1') /* 2x1
subsampled Cb:Cr plane */
-
-+#define DRM_FORMAT_MT12 fourcc_code('M', 'T', '1', '2') /* Mediatek
Block Mode */
-+#define DRM_FORMAT_MT21 fourcc_code('M', 'T', '2', '1') /* Mediatek
Block Mode */
-+
- /*
- * 3 plane YCbCr
- * index 0: Y plane, [7:0] Y
---
-2.1.2
-
diff --git a/x11-libs/libdrm/libdrm-2.4.65-r1.ebuild
b/x11-libs/libdrm/libdrm-2.4.65-r1.ebuild
new file mode 120000
index 0000000..4a484c7
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.65-r1.ebuild
@@ -0,0 +1 @@
+libdrm-2.4.65.ebuild
\ No newline at end of file
diff --git a/x11-libs/libdrm/libdrm-2.4.65.ebuild
b/x11-libs/libdrm/libdrm-2.4.65.ebuild
index c8a5905..8dbfabf 100644
--- a/x11-libs/libdrm/libdrm-2.4.65.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.65.ebuild
@@ -46,7 +46,7 @@
"${FILESDIR}"/drm_rockchip-0001-add-support-for-rockchip.patch
"${FILESDIR}"/drm_mediatek-0001-add-support-for-mediatek.patch

"${FILESDIR}"/drm_mediatek-0002-tests-add-mediatek-to-modetest-kmstest-vbltest-and-p.patch
- "${FILESDIR}"/drm_mediatek-0003-Add-Mediatek-proprietary-formats.patch
+ "${FILESDIR}"/drm_mediatek-0003-Add-Mediatek-proprietary-format.patch
"${FILESDIR}"/drm_vgem-0001-add-vgem-ioctl-macro-definitions.patch
)


--
To view, visit https://chromium-review.googlesource.com/324164
To unsubscribe, visit https://chromium-review.googlesource.com/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
Gerrit-PatchSet: 1
Gerrit-Project: chromiumos/overlays/chromiumos-overlay
Gerrit-Branch: master
Gerrit-Owner: Daniel Kurtz <djk...@chromium.org>
Gerrit-Reviewer: Nicolas Boichat <drin...@chromium.org>
Gerrit-Reviewer: Rufus Hamade <rufus....@imgtec.com>
Gerrit-Reviewer: Wu-cheng Li <wuch...@chromium.org>

Nicolas Boichat (Gerrit)

unread,
Jan 27, 2016, 8:02:00 AM1/27/16
to Daniel Kurtz, Wu-cheng Li, Rufus Hamade
Nicolas Boichat has posted comments on this change.

Change subject: x11-libs/libdrm: Remove support for MT12
......................................................................


Patch Set 1: Code-Review+2 Trybot-Ready+1
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
Gerrit-PatchSet: 1
Gerrit-Project: chromiumos/overlays/chromiumos-overlay
Gerrit-Branch: master
Gerrit-Owner: Daniel Kurtz <djk...@chromium.org>
Gerrit-Reviewer: Nicolas Boichat <drin...@chromium.org>
Gerrit-Reviewer: Rufus Hamade <rufus....@imgtec.com>
Gerrit-Reviewer: Wu-cheng Li <wuch...@chromium.org>
Gerrit-HasComments: No

Daniel Kurtz (Gerrit)

unread,
Jan 27, 2016, 4:42:43 PM1/27/16
to ChromeOS bot, Rufus Hamade, Wu-cheng Li, Nicolas Boichat
Daniel Kurtz has uploaded a new patch set (#2).

Change subject: x11-libs/libdrm: Remove support for MT12
......................................................................

x11-libs/libdrm: Remove support for MT12

There is only one MTK format, MT21, there is no MT12.

Signed-off-by: Daniel Kurtz <djk...@chromium.org>

BUG=chrome-os-partner:38394
TEST=videojs.com, confirm '0' increments on chrome://histograms/Media.Gpu
CQ-DEPEND=CL:*246225

Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
---
A
x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-format.patch
D
x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-formats.patch
A x11-libs/libdrm/libdrm-2.4.65-r1.ebuild
M x11-libs/libdrm/libdrm-2.4.65.ebuild
4 files changed, 30 insertions(+), 31 deletions(-)


Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
Gerrit-PatchSet: 2
Gerrit-Project: chromiumos/overlays/chromiumos-overlay
Gerrit-Branch: master
Gerrit-Owner: Daniel Kurtz <djk...@chromium.org>
Gerrit-Reviewer: ChromeOS bot
<3su6n15k...@developer.gserviceaccount.com>

Daniel Kurtz (Gerrit)

unread,
Jan 27, 2016, 4:43:23 PM1/27/16
to Wu-cheng Li, Rufus Hamade, ChromeOS bot, Nicolas Boichat
Daniel Kurtz has posted comments on this change.

Change subject: x11-libs/libdrm: Remove support for MT12
......................................................................


Patch Set 2: Code-Review+2

Oops, I forgot to click "Publish Edit"...

Carry-forward drinkcat +2 CR
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
Gerrit-PatchSet: 2
Gerrit-Project: chromiumos/overlays/chromiumos-overlay
Gerrit-Branch: master
Gerrit-Owner: Daniel Kurtz <djk...@chromium.org>
Gerrit-Reviewer: ChromeOS bot
<3su6n15k...@developer.gserviceaccount.com>
Gerrit-Reviewer: Daniel Kurtz <djk...@chromium.org>
Gerrit-Reviewer: Nicolas Boichat <drin...@chromium.org>
Gerrit-Reviewer: Rufus Hamade <rufus....@imgtec.com>
Gerrit-Reviewer: Wu-cheng Li <wuch...@chromium.org>
Gerrit-HasComments: No

Daniel Kurtz (Gerrit)

unread,
Jan 28, 2016, 12:01:03 AM1/28/16
to Nicolas Boichat, ChromeOS bot, Rufus Hamade, Wu-cheng Li
Hello Nicolas Boichat,

I'd like you to reexamine a change. Please visit

https://chromium-review.googlesource.com/324164

to look at the new patch set (#3).

Change subject: x11-libs/libdrm: Remove support for MT12
......................................................................

x11-libs/libdrm: Remove support for MT12

There is only one MTK format, MT21, there is no MT12.

Note: This patch can only land after all users of the MT12 defines
(mesa-img, img-ddk) have been fixed.

Signed-off-by: Daniel Kurtz <djk...@chromium.org>

BUG=chrome-os-partner:38394
TEST=videojs.com, confirm '0' increments on chrome://histograms/Media.Gpu
CQ-DEPEND=CL:*246225
CQ-DEPEND=CL:324163

Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
---
A
x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-format.patch
D
x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-formats.patch
R x11-libs/libdrm/libdrm-2.4.66-r2.ebuild
M x11-libs/libdrm/libdrm-2.4.66.ebuild
4 files changed, 29 insertions(+), 31 deletions(-)
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
Gerrit-PatchSet: 3
Gerrit-Project: chromiumos/overlays/chromiumos-overlay
Gerrit-Branch: master
Gerrit-Owner: Daniel Kurtz <djk...@chromium.org>
Gerrit-Reviewer: ChromeOS bot
<3su6n15k...@developer.gserviceaccount.com>
Gerrit-Reviewer: Daniel Kurtz <djk...@chromium.org>

Nicolas Boichat (Gerrit)

unread,
Jan 28, 2016, 12:09:11 AM1/28/16
to Daniel Kurtz, Wu-cheng Li, Rufus Hamade, ChromeOS bot
Nicolas Boichat has posted comments on this change.

Change subject: x11-libs/libdrm: Remove support for MT12
......................................................................


Patch Set 3: Code-Review+2 Trybot-Ready+1
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
Gerrit-PatchSet: 3
Gerrit-Project: chromiumos/overlays/chromiumos-overlay
Gerrit-Branch: master
Gerrit-Owner: Daniel Kurtz <djk...@chromium.org>
Gerrit-Reviewer: ChromeOS bot
<3su6n15k...@developer.gserviceaccount.com>
Gerrit-Reviewer: Daniel Kurtz <djk...@chromium.org>
Gerrit-Reviewer: Nicolas Boichat <drin...@chromium.org>
Gerrit-Reviewer: Rufus Hamade <rufus....@imgtec.com>
Gerrit-Reviewer: Wu-cheng Li <wuch...@chromium.org>
Gerrit-HasComments: No

Daniel Kurtz (Gerrit)

unread,
Jan 28, 2016, 3:12:10 AM1/28/16
to Wu-cheng Li, Rufus Hamade, ChromeOS bot, Nicolas Boichat
Daniel Kurtz has posted comments on this change.

Change subject: x11-libs/libdrm: Remove support for MT12
......................................................................


Patch Set 3: Commit-Queue+1 Verified+1 Trybot-Ready+1
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
Gerrit-PatchSet: 3
Gerrit-Project: chromiumos/overlays/chromiumos-overlay
Gerrit-Branch: master
Gerrit-Owner: Daniel Kurtz <djk...@chromium.org>
Gerrit-Reviewer: ChromeOS bot
<3su6n15k...@developer.gserviceaccount.com>
Gerrit-Reviewer: Daniel Kurtz <djk...@chromium.org>
Gerrit-Reviewer: Nicolas Boichat <drin...@chromium.org>
Gerrit-Reviewer: Rufus Hamade <rufus....@imgtec.com>
Gerrit-Reviewer: Wu-cheng Li <wuch...@chromium.org>
Gerrit-HasComments: No

ChromeOS Commit Bot (Gerrit)

unread,
Jan 28, 2016, 9:22:35 AM1/28/16
to Daniel Kurtz, Wu-cheng Li, Rufus Hamade, ChromeOS bot, Nicolas Boichat
ChromeOS Commit Bot has submitted this change and it was merged.

Change subject: x11-libs/libdrm: Remove support for MT12
......................................................................


x11-libs/libdrm: Remove support for MT12

There is only one MTK format, MT21, there is no MT12.

Note: This patch can only land after all users of the MT12 defines
(mesa-img, img-ddk) have been fixed.

Signed-off-by: Daniel Kurtz <djk...@chromium.org>

BUG=chrome-os-partner:38394
TEST=videojs.com, confirm '0' increments on chrome://histograms/Media.Gpu
CQ-DEPEND=CL:*246225
CQ-DEPEND=CL:324163

Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
Reviewed-on: https://chromium-review.googlesource.com/324164
Commit-Ready: Daniel Kurtz <djk...@chromium.org>
Tested-by: Daniel Kurtz <djk...@chromium.org>
Reviewed-by: Nicolas Boichat <drin...@chromium.org>
---
A
x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-format.patch
D
x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-formats.patch
R x11-libs/libdrm/libdrm-2.4.66-r2.ebuild
M x11-libs/libdrm/libdrm-2.4.66.ebuild
4 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/x11-libs/libdrm/libdrm-2.4.66-r1.ebuild
b/x11-libs/libdrm/libdrm-2.4.66-r2.ebuild
similarity index 100%
rename from x11-libs/libdrm/libdrm-2.4.66-r1.ebuild
rename to x11-libs/libdrm/libdrm-2.4.66-r2.ebuild
diff --git a/x11-libs/libdrm/libdrm-2.4.66.ebuild
b/x11-libs/libdrm/libdrm-2.4.66.ebuild
index 88d765c..848d3a8 100644
--- a/x11-libs/libdrm/libdrm-2.4.66.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.66.ebuild
@@ -45,7 +45,7 @@
"${FILESDIR}"/drm_rockchip-0001-add-support-for-rockchip.patch
"${FILESDIR}"/drm_mediatek-0001-add-support-for-mediatek.patch

"${FILESDIR}"/drm_mediatek-0002-tests-add-mediatek-to-modetest-kmstest-vbltest-and-p.patch
- "${FILESDIR}"/drm_mediatek-0003-Add-Mediatek-proprietary-formats.patch
+ "${FILESDIR}"/drm_mediatek-0003-Add-Mediatek-proprietary-format.patch
"${FILESDIR}"/drm_vgem-0001-add-vgem-ioctl-macro-definitions.patch
)


--
To view, visit https://chromium-review.googlesource.com/324164
To unsubscribe, visit https://chromium-review.googlesource.com/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
Gerrit-PatchSet: 4
Gerrit-Project: chromiumos/overlays/chromiumos-overlay
Gerrit-Branch: master
Gerrit-Owner: Daniel Kurtz <djk...@chromium.org>
Gerrit-Reviewer: ChromeOS Commit Bot <chromeos-...@chromium.org>
Gerrit-Reviewer: ChromeOS bot
<3su6n15k...@developer.gserviceaccount.com>
Gerrit-Reviewer: Daniel Kurtz <djk...@chromium.org>

ChromeOS Commit Bot (Gerrit)

unread,
Jan 28, 2016, 9:22:36 AM1/28/16
to Daniel Kurtz, Nicolas Boichat, ChromeOS bot, Rufus Hamade, Wu-cheng Li
Hello Daniel Kurtz, Nicolas Boichat,

I'd like you to reexamine a change. Please visit

https://chromium-review.googlesource.com/324164

to look at the new patch set (#4).

Change subject: x11-libs/libdrm: Remove support for MT12
......................................................................

x11-libs/libdrm: Remove support for MT12

There is only one MTK format, MT21, there is no MT12.

Note: This patch can only land after all users of the MT12 defines
(mesa-img, img-ddk) have been fixed.

Signed-off-by: Daniel Kurtz <djk...@chromium.org>

BUG=chrome-os-partner:38394
TEST=videojs.com, confirm '0' increments on chrome://histograms/Media.Gpu
CQ-DEPEND=CL:*246225
CQ-DEPEND=CL:324163

Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
Reviewed-on: https://chromium-review.googlesource.com/324164
Commit-Ready: Daniel Kurtz <djk...@chromium.org>
Tested-by: Daniel Kurtz <djk...@chromium.org>
Reviewed-by: Nicolas Boichat <drin...@chromium.org>
---
A
x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-format.patch
D
x11-libs/libdrm/files/drm_mediatek-0003-Add-Mediatek-proprietary-formats.patch
R x11-libs/libdrm/libdrm-2.4.66-r2.ebuild
M x11-libs/libdrm/libdrm-2.4.66.ebuild
4 files changed, 29 insertions(+), 31 deletions(-)


Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie0d595f6c7916efc808f20e7d1ec9d389991fb33
Gerrit-PatchSet: 4
Gerrit-Project: chromiumos/overlays/chromiumos-overlay
Gerrit-Branch: master
Gerrit-Owner: Daniel Kurtz <djk...@chromium.org>
Gerrit-Reviewer: ChromeOS Commit Bot <chromeos-...@chromium.org>
Gerrit-Reviewer: ChromeOS bot
<3su6n15k...@developer.gserviceaccount.com>
Gerrit-Reviewer: Daniel Kurtz <djk...@chromium.org>
Reply all
Reply to author
Forward
0 new messages