Skip to contentSkip to conversation

drm/i915: Adding YUV444 packed format(DRM_FORMAT_AYUV) support.

PATCH In review StanLis 4 participants 7 messages Jul 4, 2018 – Jul 5, 2018

Subsystems (2)
lore
Share & tools
lore

StanLis

author
#0 lore raw

PATCH v4 1/1 drm/i915: Adding YUV444 packed format(DRM_FORMAT_AYUV) support.

From: Stanislav Lisovskiy <[email protected]>

PLANE_CTL_FORMAT_AYUV is already supported, according to hardware specification.

v2: Edited commit message, removed redundant whitespaces.

v3: Fixed fallthrough logic for the format switch cases.

v4: Yet again fixed fallthrough logic, to reuse code from other case
labels.

---
 drivers/gpu/drm/i915/intel_display.c | 7 +++++++
 drivers/gpu/drm/i915/intel_sprite.c  | 1 +
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_display.c +7 -0
index 56818a45181c..b121b3378aa2 100644
@@ -86,6 +86,7 @@ static const uint32_t skl_primary_formats[] = {
 	DRM_FORMAT_YVYU,
 	DRM_FORMAT_UYVY,
 	DRM_FORMAT_VYUY,
+	DRM_FORMAT_AYUV,
 };
 
 static const uint32_t skl_pri_planar_formats[] = {
@@ -102,6 +103,7 @@ static const uint32_t skl_pri_planar_formats[] = {
 	DRM_FORMAT_UYVY,
 	DRM_FORMAT_VYUY,
 	DRM_FORMAT_NV12,
+	DRM_FORMAT_AYUV,
 };
 
 static const uint64_t skl_format_modifiers_noccs[] = {
@@ -3497,6 +3499,8 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)
 		return PLANE_CTL_FORMAT_XRGB_2101010;
 	case DRM_FORMAT_XBGR2101010:
 		return PLANE_CTL_ORDER_RGBX | PLANE_CTL_FORMAT_XRGB_2101010;
+	case DRM_FORMAT_AYUV:
+		return PLANE_CTL_FORMAT_AYUV;
 	case DRM_FORMAT_YUYV:
 		return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_YUYV;
 	case DRM_FORMAT_YVYU:
@@ -13371,6 +13375,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 	}
 
 	switch (format) {
+
 	case DRM_FORMAT_XRGB8888:
 	case DRM_FORMAT_XBGR8888:
 	case DRM_FORMAT_ARGB8888:
@@ -13390,6 +13395,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 		if (modifier == I915_FORMAT_MOD_Yf_TILED)
 			return true;
 		/* fall through */
+	case DRM_FORMAT_AYUV:
 	case DRM_FORMAT_C8:
 		if (modifier == DRM_FORMAT_MOD_LINEAR ||
 		    modifier == I915_FORMAT_MOD_X_TILED ||
@@ -14510,6 +14516,7 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
 			goto err;
 		}
 		break;
+	case DRM_FORMAT_AYUV:
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_UYVY:
 	case DRM_FORMAT_YVYU:
drivers/gpu/drm/i915/intel_sprite.c +1 -0
index 344c0e709b19..ee9f7242aa2b 100644
@@ -1424,6 +1424,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 		if (modifier == I915_FORMAT_MOD_Yf_TILED)
 			return true;
 		/* fall through */
+	case DRM_FORMAT_AYUV:
 	case DRM_FORMAT_C8:
 		if (modifier == DRM_FORMAT_MOD_LINEAR ||
 		    modifier == I915_FORMAT_MOD_X_TILED ||
Signature · 6 lines
2.17.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Fi.CI.CHECKPATCH: warning for drm/i915: Adding YUV444 packed format(DRM_FORMAT_AYUV) support. (rev4)

== Series Details ==

== Series Details ==

Series: drm/i915: Adding YUV444 packed format(DRM_FORMAT_AYUV) support. (rev4)
URL : https://patchwork.freedesktop.org/series/45774/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
e74c7fdd30c5 drm/i915: Adding YUV444 packed format(DRM_FORMAT_AYUV) support.
-:52: CHECK:BRACES: Blank lines aren't necessary after an open brace '{'
#52: FILE: drivers/gpu/drm/i915/intel_display.c:13378:
 	switch (format) {
+

total: 0 errors, 0 warnings, 1 checks, 50 lines checked

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✓ Fi.CI.BAT: success for drm/i915: Adding YUV444 packed format(DRM_FORMAT_AYUV) support. (rev4)

In reply to StanLis
== Series Details ==

== Series Details ==

Series: drm/i915: Adding YUV444 packed format(DRM_FORMAT_AYUV) support. (rev4)
URL : https://patchwork.freedesktop.org/series/45774/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4425 -> Patchwork_9521 =

== Summary - SUCCESS ==

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/45774/revisions/4/mbox/

== Changes ==

No changes found

== Participating hosts (46 -> 40) ==

Missing (6): fi-ilk-m540 fi-bxt-dsi fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600

== Build changes ==

* Linux: CI_DRM_4425 -> Patchwork_9521

CI_DRM_4425: 655f2c563a64861ef52008d968092a62644caf96 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4534: aeb3f4143572b81a907921ad9442858aafe1931e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9521: e74c7fdd30c5a48b191bece2580e76a68b754e83 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

e74c7fdd30c5 drm/i915: Adding YUV444 packed format(DRM_FORMAT_AYUV) support.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9521/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

✗ Fi.CI.IGT: failure for drm/i915: Adding YUV444 packed format(DRM_FORMAT_AYUV) support. (rev4)

In reply to StanLis
== Series Details ==

== Series Details ==

Series: drm/i915: Adding YUV444 packed format(DRM_FORMAT_AYUV) support. (rev4)
URL : https://patchwork.freedesktop.org/series/45774/
State : failure

== Summary ==

= CI Bug Log - changes from CI_DRM_4425_full -> Patchwork_9521_full =

== Summary - FAILURE ==

Serious unknown changes coming with Patchwork_9521_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_9521_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

== Possible new issues ==

Here are the unknown changes that may have been introduced in Patchwork_9521_full:

=== IGT changes ===

    ==== Possible regressions ====

    igt@kms_available_modes_crc@available_mode_test_crc:
      shard-apl:          PASS -> FAIL

    
    ==== Warnings ====

    igt@gem_exec_schedule@deep-bsd2:
      shard-kbl:          PASS -> SKIP +2

    igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
      shard-snb:          SKIP -> PASS +1

    igt@perf_pmu@rc6:
      shard-kbl:          SKIP -> PASS

== Known issues ==

Here are the changes found in Patchwork_9521_full that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@kms_flip@plain-flip-fb-recreate-interruptible:
      shard-hsw:          PASS -> FAIL (fdo#100368)

    
    ==== Possible fixes ====

    igt@kms_flip@2x-flip-vs-expired-vblank:
      shard-hsw:          FAIL (fdo#105363) -> PASS

    igt@kms_flip@wf_vblank-ts-check:
      shard-glk:          FAIL (fdo#100368) -> PASS

    igt@kms_setmode@basic:
      shard-apl:          FAIL (fdo#99912) -> PASS

    
    ==== Warnings ====

    igt@drv_selftest@live_gtt:
      shard-kbl:          INCOMPLETE (fdo#103665) -> FAIL (fdo#105347)

fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912

== Participating hosts (5 -> 5) ==

No changes in participating hosts

== Build changes ==

* Linux: CI_DRM_4425 -> Patchwork_9521

CI_DRM_4425: 655f2c563a64861ef52008d968092a62644caf96 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4534: aeb3f4143572b81a907921ad9442858aafe1931e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9521: e74c7fdd30c5a48b191bece2580e76a68b754e83 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9521/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
In reply to StanLis
Quoted 5 lines · StanLis

From: Stanislav Lisovskiy <[email protected]>

PLANE_CTL_FORMAT_AYUV is already supported, according to hardware specification.

Quoted 8 lines

v2: Edited commit message, removed redundant whitespaces.

v3: Fixed fallthrough logic for the format switch cases.

v4: Yet again fixed fallthrough logic, to reuse code from other case
labels.

Do we have userspace and igt testcases for this?
-Daniel

Quoted 77 lines
---
 drivers/gpu/drm/i915/intel_display.c | 7 +++++++
 drivers/gpu/drm/i915/intel_sprite.c  | 1 +
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_display.c +7 -0
index 56818a45181c..b121b3378aa2 100644
@@ -86,6 +86,7 @@ static const uint32_t skl_primary_formats[] = {
 	DRM_FORMAT_YVYU,
 	DRM_FORMAT_UYVY,
 	DRM_FORMAT_VYUY,
+	DRM_FORMAT_AYUV,
 };
 
 static const uint32_t skl_pri_planar_formats[] = {
@@ -102,6 +103,7 @@ static const uint32_t skl_pri_planar_formats[] = {
 	DRM_FORMAT_UYVY,
 	DRM_FORMAT_VYUY,
 	DRM_FORMAT_NV12,
+	DRM_FORMAT_AYUV,
 };
 
 static const uint64_t skl_format_modifiers_noccs[] = {
@@ -3497,6 +3499,8 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)
 		return PLANE_CTL_FORMAT_XRGB_2101010;
 	case DRM_FORMAT_XBGR2101010:
 		return PLANE_CTL_ORDER_RGBX | PLANE_CTL_FORMAT_XRGB_2101010;
+	case DRM_FORMAT_AYUV:
+		return PLANE_CTL_FORMAT_AYUV;
 	case DRM_FORMAT_YUYV:
 		return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_YUYV;
 	case DRM_FORMAT_YVYU:
@@ -13371,6 +13375,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 	}
 
 	switch (format) {
+
 	case DRM_FORMAT_XRGB8888:
 	case DRM_FORMAT_XBGR8888:
 	case DRM_FORMAT_ARGB8888:
@@ -13390,6 +13395,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 		if (modifier == I915_FORMAT_MOD_Yf_TILED)
 			return true;
 		/* fall through */
+	case DRM_FORMAT_AYUV:
 	case DRM_FORMAT_C8:
 		if (modifier == DRM_FORMAT_MOD_LINEAR ||
 		    modifier == I915_FORMAT_MOD_X_TILED ||
@@ -14510,6 +14516,7 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
 			goto err;
 		}
 		break;
+	case DRM_FORMAT_AYUV:
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_UYVY:
 	case DRM_FORMAT_YVYU:
drivers/gpu/drm/i915/intel_sprite.c +1 -0
index 344c0e709b19..ee9f7242aa2b 100644
@@ -1424,6 +1424,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 		if (modifier == I915_FORMAT_MOD_Yf_TILED)
 			return true;
 		/* fall through */
+	case DRM_FORMAT_AYUV:
 	case DRM_FORMAT_C8:
 		if (modifier == DRM_FORMAT_MOD_LINEAR ||
 		    modifier == I915_FORMAT_MOD_X_TILED ||
Signature · 6 lines
2.17.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw
Quoted 10 lines · Daniel Vetter
Quoted 9 lines · StanLis

From: Stanislav Lisovskiy <[email protected]>

PLANE_CTL_FORMAT_AYUV is already supported, according to hardware specification.

v2: Edited commit message, removed redundant whitespaces.

v3: Fixed fallthrough logic for the format switch cases.

Quoted 8 lines
Quoted 5 lines

v4: Yet again fixed fallthrough logic, to reuse code from other case
labels.

Do we have userspace and igt testcases for this?
-Daniel

So far, I've checked it only with own test program and VLC player, however currently I'm working on igt test case for that also.

Quoted 90 lines
Quoted 88 lines
---
 drivers/gpu/drm/i915/intel_display.c | 7 +++++++
 drivers/gpu/drm/i915/intel_sprite.c  | 1 +
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_display.c +2 -0
index 56818a45181c..b121b3378aa2 100644
@@ -86,6 +86,7 @@ static const uint32_t skl_primary_formats[] = {
 	DRM_FORMAT_YVYU,
 	DRM_FORMAT_UYVY,
 	DRM_FORMAT_VYUY,
+	DRM_FORMAT_AYUV,
 };
 
 static const uint32_t skl_pri_planar_formats[] = {
@@ -102,6 +103,7 @@ static const uint32_t skl_pri_planar_formats[]
 = {
 	DRM_FORMAT_UYVY,
 	DRM_FORMAT_VYUY,
 	DRM_FORMAT_NV12,
+	DRM_FORMAT_AYUV,
 };
 

static const uint64_t skl_format_modifiers_noccs[] = {

drivers/gpu/drm/i915/intel_display.c +2 -0
@@ -3497,6 +3499,8 @@ static u32 skl_plane_ctl_format(uint32_t
 pixel_format)
 		return PLANE_CTL_FORMAT_XRGB_2101010;
 	case DRM_FORMAT_XBGR2101010:
 		return PLANE_CTL_ORDER_RGBX |
 PLANE_CTL_FORMAT_XRGB_2101010;
+	case DRM_FORMAT_AYUV:
+		return PLANE_CTL_FORMAT_AYUV;
 	case DRM_FORMAT_YUYV:

return PLANE_CTL_FORMAT_YUV422 |
PLANE_CTL_YUV422_YUYV;

drivers/gpu/drm/i915/intel_display.c +1 -0
 	case DRM_FORMAT_YVYU:
@@ -13371,6 +13375,7 @@ static bool
 skl_plane_format_mod_supported(struct drm_plane *_plane,
 	}
 
 	switch (format) {
+
 	case DRM_FORMAT_XRGB8888:
 	case DRM_FORMAT_XBGR8888:
drivers/gpu/drm/i915/intel_display.c +1 -0
 	case DRM_FORMAT_ARGB8888:
@@ -13390,6 +13395,7 @@ static bool
 skl_plane_format_mod_supported(struct drm_plane *_plane,
 		if (modifier == I915_FORMAT_MOD_Yf_TILED)
 			return true;
 		/* fall through */
+	case DRM_FORMAT_AYUV:
 	case DRM_FORMAT_C8:
 		if (modifier == DRM_FORMAT_MOD_LINEAR ||
drivers/gpu/drm/i915/intel_display.c +1 -0
 		    modifier == I915_FORMAT_MOD_X_TILED ||
@@ -14510,6 +14516,7 @@ static int intel_framebuffer_init(struct
 intel_framebuffer *intel_fb,
 			goto err;
 		}
 		break;
+	case DRM_FORMAT_AYUV:
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_UYVY:
drivers/gpu/drm/i915/intel_display.c +0 -0
 	case DRM_FORMAT_YVYU:
drivers/gpu/drm/i915/intel_sprite.c +1 -0
index 344c0e709b19..ee9f7242aa2b 100644
@@ -1424,6 +1424,7 @@ static bool
 skl_plane_format_mod_supported(struct drm_plane *_plane,
 		if (modifier == I915_FORMAT_MOD_Yf_TILED)
 			return true;
 		/* fall through */
+	case DRM_FORMAT_AYUV:
 	case DRM_FORMAT_C8:
 		if (modifier == DRM_FORMAT_MOD_LINEAR ||

modifier == I915_FORMAT_MOD_X_TILED ||

Signature · 6 lines
2.17.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Best Regards,

Lisovskiy Stanislav
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw
In reply to StanLis
Quoted 23 lines · StanLis

From: Stanislav Lisovskiy <[email protected]>

PLANE_CTL_FORMAT_AYUV is already supported, according to hardware specification.

v2: Edited commit message, removed redundant whitespaces.

v3: Fixed fallthrough logic for the format switch cases.

v4: Yet again fixed fallthrough logic, to reuse code from other case
labels.

---
 drivers/gpu/drm/i915/intel_display.c | 7 +++++++
 drivers/gpu/drm/i915/intel_sprite.c  | 1 +
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_display.c +0 -0
index 56818a45181c..b121b3378aa2 100644

drivers/gpu/drm/i915/intel_display.c static const uint32_t skl_primary_formats[] = { · line 89

Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +1 -0
@@ -86,6 +86,7 @@ static const uint32_t skl_primary_formats[] = {
 	DRM_FORMAT_YVYU,
 	DRM_FORMAT_UYVY,
 	DRM_FORMAT_VYUY,
+	DRM_FORMAT_AYUV,

We'll need an XYUV format because the hw doesn't do alpha with these IIRC. Also I believe this should be already be available since ~IVB.

Quoted 29 lines
drivers/gpu/drm/i915/intel_display.c +4 -0
 };
 
 static const uint32_t skl_pri_planar_formats[] = {
@@ -102,6 +103,7 @@ static const uint32_t skl_pri_planar_formats[] = {
 	DRM_FORMAT_UYVY,
 	DRM_FORMAT_VYUY,
 	DRM_FORMAT_NV12,
+	DRM_FORMAT_AYUV,
 };
 
 static const uint64_t skl_format_modifiers_noccs[] = {
@@ -3497,6 +3499,8 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)
 		return PLANE_CTL_FORMAT_XRGB_2101010;
 	case DRM_FORMAT_XBGR2101010:
 		return PLANE_CTL_ORDER_RGBX | PLANE_CTL_FORMAT_XRGB_2101010;
+	case DRM_FORMAT_AYUV:
+		return PLANE_CTL_FORMAT_AYUV;
 	case DRM_FORMAT_YUYV:
 		return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_YUYV;
 	case DRM_FORMAT_YVYU:
@@ -13371,6 +13375,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 	}
 
 	switch (format) {
+
 	case DRM_FORMAT_XRGB8888:
 	case DRM_FORMAT_XBGR8888:
 	case DRM_FORMAT_ARGB8888:

drivers/gpu/drm/i915/intel_display.c static bool skl_plane_format_mod_supported(struct drm_plane *_plane, · line 13399

Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +1 -0
@@ -13390,6 +13395,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 		if (modifier == I915_FORMAT_MOD_Yf_TILED)
 			return true;
 		/* fall through */
+	case DRM_FORMAT_AYUV:
 	case DRM_FORMAT_C8:

I think Yf should be perfecly fine with this format.

Quoted 15 lines
drivers/gpu/drm/i915/intel_display.c +1 -0
 		if (modifier == DRM_FORMAT_MOD_LINEAR ||
 		    modifier == I915_FORMAT_MOD_X_TILED ||
@@ -14510,6 +14516,7 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
 			goto err;
 		}
 		break;
+	case DRM_FORMAT_AYUV:
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_UYVY:
 	case DRM_FORMAT_YVYU:
drivers/gpu/drm/i915/intel_sprite.c +0 -0
index 344c0e709b19..ee9f7242aa2b 100644

drivers/gpu/drm/i915/intel_sprite.c static bool skl_plane_format_mod_supported(struct drm_plane *_plane, · line 1430

Quoted 7 lines
drivers/gpu/drm/i915/intel_sprite.c +1 -0
@@ -1424,6 +1424,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 		if (modifier == I915_FORMAT_MOD_Yf_TILED)
 			return true;
 		/* fall through */
+	case DRM_FORMAT_AYUV:
 	case DRM_FORMAT_C8:
 		if (modifier == DRM_FORMAT_MOD_LINEAR ||
 		    modifier == I915_FORMAT_MOD_X_TILED ||

Looks like you're missing a lot of stuff from the sprite plane code. But rather than add all that duplicated junk I recommed that you review
https://patchwork.freedesktop.org/series/39390/ instead as there I remove all this silly duplication between the two plane types.

Quoted 2 lines
Signature · 1 line
2.17.0
Signature · 6 lines
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx