Add XYUV format support
Subsystems (3)
v8 cover Add XYUV format support
Introduced new XYUV scan-in format for framebuffer and added support for it to i915(SkyLake+).
Stanislav Lisovskiy (2):
drm: Introduce new DRM_FORMAT_XYUV
drm/i915: Adding YUV444 packed format support for skl+
drivers/gpu/drm/drm_fourcc.c | 1 + drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 9 +++++++++ drivers/gpu/drm/i915/intel_sprite.c | 1 + include/uapi/drm/drm_fourcc.h | 1 + 5 files changed, 13 insertions(+), 1 deletion(-)
Signature · 6 lines
2.17.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 1/2 drm: Introduce new DRM_FORMAT_XYUV
v5: This is YUV444 packed format same as AYUV, but without alpha,
as supported by i915.
v6: Removed unneeded initializer for new XYUV format.
v7: Added is_yuv field initialization according to latest
drm_fourcc format structure initialization changes.
v8: Edited commit message to be more clear about skl+, renamed
PLANE_CTL_FORMAT_AYUV to PLANE_CTL_FORMAT_XYUV as this format doesn't support per-pixel alpha. Fixed minor code issues.
--- drivers/gpu/drm/drm_fourcc.c | 1 + include/uapi/drm/drm_fourcc.h | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/drm_fourcc.c +1 -0
@@ -173,6 +173,7 @@ const struct drm_format_info *__drm_format_info(u32 format) { .format = DRM_FORMAT_UYVY, .depth = 0, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 2, .vsub = 1, .is_yuv = true }, { .format = DRM_FORMAT_VYUY, .depth = 0, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 2, .vsub = 1, .is_yuv = true }, { .format = DRM_FORMAT_AYUV, .depth = 0, .num_planes = 1, .cpp = { 4, 0, 0 }, .hsub = 1, .vsub = 1, .has_alpha = true, .is_yuv = true }, + { .format = DRM_FORMAT_XYUV, .depth = 0, .num_planes = 1, .cpp = { 4, 0, 0 }, .hsub = 1, .vsub = 1, .is_yuv = true }, }; unsigned int i;
include/uapi/drm/drm_fourcc.h +1 -0
@@ -148,6 +148,7 @@ extern "C" {#define DRM_FORMAT_VYUY fourcc_code('V', 'Y', 'U', 'Y')/* [31:0] Y1:Cb0:Y0:Cr0 8:8:8:8 little endian */ #define DRM_FORMAT_AYUV fourcc_code('A', 'Y', 'U', 'V')/* [31:0] A:Y:Cb:Cr 8:8:8:8 little endian */ +#define DRM_FORMAT_XYUV fourcc_code('X', 'Y', 'U', 'V')/* [31:0] X:Y:Cb:Cr 8:8:8:8 little endian */ /* * 2 plane RGB + A
Signature · 6 lines
2.17.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 2/2 drm/i915: Adding YUV444 packed format support for skl+
In reply to Stanislav LisovskiyPLANE_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.
v5: Started to use XYUV instead of AYUV, as we don't use alpha.
v6: Removed unneeded initializer for new XYUV format.
v7: Added scaling support for DRM_FORMAT_XYUV
v8: Edited commit message to be more clear about skl+, renamed
PLANE_CTL_FORMAT_AYUV to PLANE_CTL_FORMAT_XYUV as this format doesn't support per-pixel alpha. Fixed minor code issues.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 9 +++++++++ drivers/gpu/drm/i915/intel_sprite.c | 1 + 3 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -6499,7 +6499,7 @@ enum {#define PLANE_CTL_FORMAT_XRGB_2101010 (2 << 24)#define PLANE_CTL_FORMAT_XRGB_8888 (4 << 24)#define PLANE_CTL_FORMAT_XRGB_16161616F (6 << 24) -#define PLANE_CTL_FORMAT_AYUV (8 << 24) +#define PLANE_CTL_FORMAT_XYUV (8 << 24)#define PLANE_CTL_FORMAT_INDEXED (12 << 24)#define PLANE_CTL_FORMAT_RGB_565 (14 << 24)#define ICL_PLANE_CTL_FORMAT_MASK (0x1f << 23)
drivers/gpu/drm/i915/intel_display.c +9 -0
@@ -86,6 +86,7 @@ static const uint32_t skl_primary_formats[] = {DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , + DRM_FORMAT_XYUV, }; static const uint32_t skl_pri_planar_formats[] = {
@@ -101,6 +102,7 @@ static const uint32_t skl_pri_planar_formats[] = {DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , +DRM_FORMAT_XYUV , DRM_FORMAT_NV12, };
@@ -2672,6 +2674,8 @@ int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)return DRM_FORMAT_RGB565 ;case PLANE_CTL_FORMAT_NV12 :return DRM_FORMAT_NV12 ; +case PLANE_CTL_FORMAT_XYUV : +return DRM_FORMAT_XYUV ;default :case PLANE_CTL_FORMAT_XRGB_8888 :if (rgb_order) {
@@ -3501,6 +3505,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_XYUV : +return PLANE_CTL_FORMAT_XYUV ;case DRM_FORMAT_YUYV :return PLANE_CTL_FORMAT_YUV422 |PLANE_CTL_YUV422_YUYV ;case DRM_FORMAT_YVYU :
@@ -4959,6 +4965,7 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY :case DRM_FORMAT_NV12 : +case DRM_FORMAT_XYUV :break ;default : DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",
@@ -13414,6 +13421,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY :case DRM_FORMAT_NV12 : +case DRM_FORMAT_XYUV :if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;/* fall through */
@@ -14517,6 +14525,7 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, }break ;case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_XYUV :if (!IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv) &&INTEL_GEN (dev_priv) <9 ) { DRM_DEBUG_KMS("unsupported pixel format: %s\n",
drivers/gpu/drm/i915/intel_sprite.c +1 -0
@@ -1420,6 +1420,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY :case DRM_FORMAT_NV12 : +case DRM_FORMAT_XYUV :if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;/* fall through */
Signature · 6 lines
2.17.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v8 2/2] drm/i915: Adding YUV444 packed format support for skl+
Quoted 95 lines · Stanislav Lisovskiy
PLANE_CTL_FORMAT_AYUVis 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.v5: Started to use XYUV instead of AYUV, as we don't use alpha.
v6: Removed unneeded initializer for new XYUV format.
v7: Added scaling support for
DRM_FORMAT_XYUVv8: Edited commit message to be more clear about skl+, renamed
PLANE_CTL_FORMAT_AYUVtoPLANE_CTL_FORMAT_XYUVas this format doesn't support per-pixel alpha. Fixed minor code issues.Signed-off-by Stanislav Lisovskiy <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 9 +++++++++ drivers/gpu/drm/i915/intel_sprite.c | 1 + 3 files changed, 11 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -6499,7 +6499,7 @@ enum {#define PLANE_CTL_FORMAT_XRGB_2101010 (2 << 24)#define PLANE_CTL_FORMAT_XRGB_8888 (4 << 24)#define PLANE_CTL_FORMAT_XRGB_16161616F (6 << 24) -#define PLANE_CTL_FORMAT_AYUV (8 << 24) +#define PLANE_CTL_FORMAT_XYUV (8 << 24)#define PLANE_CTL_FORMAT_INDEXED (12 << 24)#define PLANE_CTL_FORMAT_RGB_565 (14 << 24)#define ICL_PLANE_CTL_FORMAT_MASK (0x1f << 23)drivers/gpu/drm/i915/intel_display.c +8
-0@@ -86,6 +86,7 @@ static const uint32_t skl_primary_formats[] = {DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , + DRM_FORMAT_XYUV, }; static const uint32_t skl_pri_planar_formats[] = {@@ -101,6 +102,7 @@ static const uint32_t skl_pri_planar_formats[] = {DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , +DRM_FORMAT_XYUV , DRM_FORMAT_NV12, };@@ -2672,6 +2674,8 @@ int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)return DRM_FORMAT_RGB565 ;case PLANE_CTL_FORMAT_NV12 :return DRM_FORMAT_NV12 ; +case PLANE_CTL_FORMAT_XYUV : +return DRM_FORMAT_XYUV ;default :case PLANE_CTL_FORMAT_XRGB_8888 :if (rgb_order) {@@ -3501,6 +3505,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_XYUV : +return PLANE_CTL_FORMAT_XYUV ;case DRM_FORMAT_YUYV :return PLANE_CTL_FORMAT_YUV422 |PLANE_CTL_YUV422_YUYV ;case DRM_FORMAT_YVYU :@@ -4959,6 +4965,7 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY :case DRM_FORMAT_NV12 : +case DRM_FORMAT_XYUV :break ;default : DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",@@ -13414,6 +13421,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY :case DRM_FORMAT_NV12 : +case DRM_FORMAT_XYUV :if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;/* fall through */
drivers/gpu/drm/i915/intel_display.c static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, · line 14529
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +1
-0@@ -14517,6 +14525,7 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, }break ;case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_XYUV : if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv) &&
VLV/CHV doesn't have this so this still looks like the wrong place.
Quoted 21 lines
drivers/gpu/drm/i915/intel_display.c +0
-0INTEL_GEN(dev_priv) < 9) { DRM_DEBUG_KMS("unsupported pixel format: %s\n",drivers/gpu/drm/i915/intel_sprite.c +1
-0@@ -1420,6 +1420,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY :case DRM_FORMAT_NV12 : +case DRM_FORMAT_XYUV :if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;/* fall through */ Signature · 6 lines
2.17.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Add XYUV format support (rev4)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: Add XYUV format support (rev4)
URL : https://patchwork.freedesktop.org/series/48007/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
e971390c33e8 drm: Introduce new DRM_FORMAT_XYUV
-:28: WARNING:LONG_LINE: line over 100 characters
#28: FILE: drivers/gpu/drm/drm_fourcc.c:176:
+ { .format = DRM_FORMAT_XYUV, .depth = 0, .num_planes = 1, .cpp = { 4, 0, 0 }, .hsub = 1, .vsub = 1, .is_yuv = true },-:40: WARNING:LONG_LINE_COMMENT: line over 100 characters #40: FILE: include/uapi/drm/drm_fourcc.h:151:
+#define DRM_FORMAT_XYUV fourcc_code('X', 'Y', 'U', 'V') /* [31:0] X:Y:Cb:Cr 8:8:8:8 little endian */
total: 0 errors, 2 warnings, 0 checks, 14 lines checked 739561aa6dab drm/i915: Adding YUV444 packed format support for skl+
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Add XYUV format support (rev4)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: Add XYUV format support (rev4)
URL : https://patchwork.freedesktop.org/series/48007/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4739 -> Patchwork_10051 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/48007/revisions/4/mbox/
== Known issues ==
Here are the changes found in Patchwork_10051 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@basic-flip-vs-modeset:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106000)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
{fi-byt-clapper}: PASS -> FAIL (fdo#107362, fdo#103191)
==== Possible fixes ====
igt@prime_vgem@basic-fence-flip:
fi-ilk-650: FAIL (fdo#104008) -> PASS {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
== Participating hosts (54 -> 49) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4739 -> Patchwork_10051
CI_DRM_4739: f65e436af74d73b095b211d5294f5d7cd5132882 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4612: e39e09910fc8e369e24f6a0cabaeb9356dbfae08 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10051: 739561aa6dabed60e865ba296435c02b0adb0b6c @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
739561aa6dab drm/i915: Adding YUV444 packed format support for skl+ e971390c33e8 drm: Introduce new DRM_FORMAT_XYUV
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10051/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx