Enable Y210, Y212, Y216 formats for ICL
Subsystems (3)
cover Enable Y210, Y212, Y216 formats for ICL
These patches enable packed format YUV422-Y210, Y212 and Y216 for 10, 12 and 16 bit respectively for ICL.
For user space component IGT:WIP
Vidya Srinivas (4):
drm: Add Y210, Y212, Y216 format definitions and fourcc drm/i915: Add Y210, Y212, Y216 plane control definitions drm/i915: Preparations for enabling Y210, Y212, Y216 formats drm/i915: Enable Y210, Y212, Y216 format for primary and sprite planes
drivers/gpu/drm/drm_fourcc.c | 3 +++ drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_display.c | 40 ++++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_sprite.c | 25 ++++++++++++++++++++-- include/uapi/drm/drm_fourcc.h | 4 ++++ 5 files changed, 71 insertions(+), 4 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/4 drm: Add Y210, Y212, Y216 format definitions and fourcc
From: Vidya Srinivas <[email protected]>
The following pixel formats are packed format that follows 4:2:2 chroma sampling. For memory represenation each component is allocated 16 bits each. Thus each pixel occupies a DWORD.
Y210: Valid data occupies MSB 10 bits.
LSB 6 bits are filled with zeroes.
Y212: Valid data occupies MSB 12 bits.
LSB 4 bits are filled with zeroes.
Y216: Valid data occupies 16 bits,
doesn't require any padding bits.
First 16 bits stores the Y value and the next 16 bits stores one of the chroma samples alternatively. The first luma sample will be accompanied by first U sample and second luma sample is accompanied by the first V sample.
--- drivers/gpu/drm/drm_fourcc.c | 3 +++ include/uapi/drm/drm_fourcc.h | 4 ++++ 2 files changed, 7 insertions(+)
drivers/gpu/drm/drm_fourcc.c +3 -0
@@ -173,6 +173,9 @@ 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_Y210, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 }, + { .format = DRM_FORMAT_Y212, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 }, + { .format = DRM_FORMAT_Y216, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 }, }; unsigned int i;
include/uapi/drm/drm_fourcc.h +4 -0
@@ -149,6 +149,10 @@#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_Y210 fourcc_code('Y', '2', '1', '0')/* [63:0] Y0:Cb0:Y1:Cr1 10:10:10:10 little endian */ +#define DRM_FORMAT_Y212 fourcc_code('Y', '2', '1', '2')/* [63:0] Y0:Cb0:Y1:Cr1 12:12:12:12 little endian */ +#define DRM_FORMAT_Y216 fourcc_code('Y', '2', '1', '6')/* [63:0] Y0:Cb0:Y1:Cr1 16:16:16:16 little endian */ +/* * 2 plane RGB + A * index 0 = RGB plane, same format as the corresponding non _A8 format has
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/4] drm: Add Y210, Y212, Y216 format definitions and fourcc
Hi,
Quoted 30 lines · Swati Sharma
From: Vidya Srinivas <[email protected]>
The following pixel formats are packed format that follows 4:2:2 chroma sampling. For memory represenation each component is allocated 16 bits each. Thus each pixel occupies a DWORD.
Y210: Valid data occupies MSB 10 bits.
LSB 6 bits are filled with zeroes.
Y212: Valid data occupies MSB 12 bits.
LSB 4 bits are filled with zeroes.
Y216: Valid data occupies 16 bits,
doesn't require any padding bits.First 16 bits stores the Y value and the next 16 bits stores one of the chroma samples alternatively. The first luma sample will be accompanied by first U sample and second luma sample is accompanied by the first V sample.
Signed-off-by Swati Sharma <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/drm_fourcc.c | 3 +++ include/uapi/drm/drm_fourcc.h | 4 ++++ 2 files changed, 7 insertions(+)drivers/gpu/drm/drm_fourcc.c +0
-0
drivers/gpu/drm/drm_fourcc.c const struct drm_format_info *__drm_format_info(u32 format) · line 179
Quoted 7 lines
drivers/gpu/drm/drm_fourcc.c +3
-0@@ -173,6 +173,9 @@ 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_Y210, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 }, + { .format = DRM_FORMAT_Y212, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 }, + { .format = DRM_FORMAT_Y216, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 }, };
you should also set is_yuv to true.
-Mahesh
Quoted 7 lines
drivers/gpu/drm/drm_fourcc.c +0
-0unsigned int i;include/uapi/drm/drm_fourcc.h +0
-0
include/uapi/drm/drm_fourcc.h line 158
Quoted 10 lines
include/uapi/drm/drm_fourcc.h +4
-0@@ -149,6 +149,10 @@#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_Y210 fourcc_code('Y', '2', '1', '0')/* [63:0] Y0:Cb0:Y1:Cr1 10:10:10:10 little endian */ +#define DRM_FORMAT_Y212 fourcc_code('Y', '2', '1', '2')/* [63:0] Y0:Cb0:Y1:Cr1 12:12:12:12 little endian */ +#define DRM_FORMAT_Y216 fourcc_code('Y', '2', '1', '6')/* [63:0] Y0:Cb0:Y1:Cr1 16:16:16:16 little endian */ +/* * 2 plane RGB + A * index 0 = RGB plane, same format as the corresponding non _A8 format has
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/4] drm: Add Y210, Y212, Y216 format definitions and fourcc
Quoted 38 lines · Mahesh
Hi,
Quoted 34 lines · Swati Sharma
From: Vidya Srinivas <[email protected]>
The following pixel formats are packed format that follows 4:2:2 chroma sampling. For memory represenation each component is allocated 16 bits each. Thus each pixel occupies a DWORD.
Y210: Valid data occupies MSB 10 bits.
LSB 6 bits are filled with zeroes.
Y212: Valid data occupies MSB 12 bits.
LSB 4 bits are filled with zeroes.
Y216: Valid data occupies 16 bits,
doesn't require any padding bits.First 16 bits stores the Y value and the next 16 bits stores one of the chroma samples alternatively. The first luma sample will be accompanied by first U sample and second luma sample is accompanied by the first V sample.
Signed-off-by Swati Sharma <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>---
drivers/gpu/drm/drm_fourcc.c | 3 +++
include/uapi/drm/drm_fourcc.h| 4 ++++2 files changed, 7 insertions(+)drivers/gpu/drm/drm_fourcc.c +0
-0@@ -173,6 +173,9 @@ 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 },
Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/drm_fourcc.c +3
-0+ { .format = DRM_FORMAT_Y210, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 }, + { .format = DRM_FORMAT_Y212, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 }, + { .format = DRM_FORMAT_Y216, .depth = 0,.num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 }, };
you should also set
is_yuvto true.
Apart from this there can be different order for YUV samples, Are you going to add those as well?
Quoted 18 lines
-Mahesh
Quoted 8 lines
unsigned int i;
include/uapi/drm/drm_fourcc.h +0
-0@@ -149,6 +149,10 @@ #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_Y210
fourcc_code('Y', '2', '1', '0')/* [63:0] Y0:Cb0:Y1:Cr1 10:10:10:10 little endian */Quoted 8 lines
+#define DRM_FORMAT_Y212
fourcc_code('Y', '2', '1', '2')/* [63:0] Y0:Cb0:Y1:Cr1 12:12:12:12 little endian */
+#define DRM_FORMAT_Y216fourcc_code('Y', '2', '1', '6')/* [63:0] Y0:Cb0:Y1:Cr1 16:16:16:16 little endian */
+
/*
* 2 plane RGB + A
* index 0 = RGB plane, same format as the corresponding non_A8format has
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/4] drm: Add Y210, Y212, Y216 format definitions and fourcc
In reply to Swati SharmaHi Swati,
Quoted 44 lines · Swati Sharma
From: Vidya Srinivas <[email protected]>
The following pixel formats are packed format that follows 4:2:2 chroma sampling. For memory represenation each component is allocated 16 bits each. Thus each pixel occupies a DWORD.
Y210: Valid data occupies MSB 10 bits.
LSB 6 bits are filled with zeroes.
Y212: Valid data occupies MSB 12 bits.
LSB 4 bits are filled with zeroes.
Y216: Valid data occupies 16 bits,
doesn't require any padding bits.First 16 bits stores the Y value and the next 16 bits stores one of the chroma samples alternatively. The first luma sample will be accompanied by first U sample and second luma sample is accompanied by the first V sample.
Signed-off-by Swati Sharma <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/drm_fourcc.c | 3 +++ include/uapi/drm/drm_fourcc.h | 4 ++++ 2 files changed, 7 insertions(+)drivers/gpu/drm/drm_fourcc.c +3
-0@@ -173,6 +173,9 @@ 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_Y210, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 }, + { .format = DRM_FORMAT_Y212, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 }, + { .format = DRM_FORMAT_Y216, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 }, }; unsigned int i;include/uapi/drm/drm_fourcc.h +0
-0
include/uapi/drm/drm_fourcc.h line 154
Quoted 6 lines
include/uapi/drm/drm_fourcc.h +3
-0@@ -149,6 +149,10 @@#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_Y210 fourcc_code('Y', '2', '1', '0')/* [63:0] Y0:Cb0:Y1:Cr1 10:10:10:10 little endian */ +#define DRM_FORMAT_Y212 fourcc_code('Y', '2', '1', '2')/* [63:0] Y0:Cb0:Y1:Cr1 12:12:12:12 little endian */ +#define DRM_FORMAT_Y216 fourcc_code('Y', '2', '1', '6')/* [63:0] Y0:Cb0:Y1:Cr1 16:16:16:16 little endian */
I don't think this comments reflect very well the actual layout of the color planes, I think you need to describe the padding as well.
Just looking at the comments without reading the commit message you could easily assume that the padding happens is in the [63:40] bits.
Quoted 11 lines
include/uapi/drm/drm_fourcc.h +1
-0+/* * 2 plane RGB + A * index 0 = RGB plane, same format as the corresponding non _A8 format has Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Cheers, Alex G _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/4 drm/i915: Add Y210, Y212, Y216 plane control definitions
In reply to Swati SharmaFrom: Vidya Srinivas <[email protected]>
Added needed plane control flag definitions for Y210, Y212 and Y216 formats.
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -6504,6 +6504,9 @@ enum {#define PLANE_CTL_FORMAT_RGB_565 (14 << 24)#define ICL_PLANE_CTL_FORMAT_MASK (0x1f << 23)#define PLANE_CTL_PIPE_CSC_ENABLE (1 << 23)/* Pre-GLK */ +#define PLANE_CTL_FORMAT_Y210 (1 << 23) +#define PLANE_CTL_FORMAT_Y212 (3 << 23) +#define PLANE_CTL_FORMAT_Y216 (5 << 23)#define PLANE_CTL_KEY_ENABLE_MASK (0x3 << 21)#define PLANE_CTL_KEY_ENABLE_SOURCE (1 << 21)#define PLANE_CTL_KEY_ENABLE_DESTINATION (2 << 21)
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/4] drm/i915: Add Y210, Y212, Y216 plane control definitions
Hi,
Please include platform name in subject line:
<drm/i915/icl>
Quoted 4 lines · Swati Sharma
From: Vidya Srinivas <[email protected]>
Added needed plane control flag definitions for Y210, Y212 and Y216 formats.
may be, add more info in commit message
-Mahesh
Quoted 12 lines
Signed-off-by Swati Sharma <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/i915/i915_reg.h +0
-0
drivers/gpu/drm/i915/i915_reg.h enum { · line 6512
Quoted 9 lines
drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -6504,6 +6504,9 @@ enum {#define PLANE_CTL_FORMAT_RGB_565 (14 << 24)#define ICL_PLANE_CTL_FORMAT_MASK (0x1f << 23)#define PLANE_CTL_PIPE_CSC_ENABLE (1 << 23)/* Pre-GLK */ +#define PLANE_CTL_FORMAT_Y210 (1 << 23) +#define PLANE_CTL_FORMAT_Y212 (3 << 23) +#define PLANE_CTL_FORMAT_Y216 (5 << 23)#define PLANE_CTL_KEY_ENABLE_MASK (0x3 << 21)#define PLANE_CTL_KEY_ENABLE_SOURCE (1 << 21)#define PLANE_CTL_KEY_ENABLE_DESTINATION (2 << 21)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/4 drm/i915: Preparations for enabling Y210, Y212, Y216 formats
In reply to Swati SharmaFrom: Vidya Srinivas <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_sprite.c | 3 +++ 2 files changed, 18 insertions(+)
drivers/gpu/drm/i915/intel_display.c +15 -0
@@ -3511,6 +3511,12 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)return PLANE_CTL_FORMAT_YUV422 |PLANE_CTL_YUV422_VYUY ;case DRM_FORMAT_NV12 :return PLANE_CTL_FORMAT_NV12 ; +case DRM_FORMAT_Y210 : +return PLANE_CTL_FORMAT_Y210 ; +case DRM_FORMAT_Y212 : +return PLANE_CTL_FORMAT_Y212 ; +case DRM_FORMAT_Y216 : +return PLANE_CTL_FORMAT_Y216 ;default :MISSING_CASE (pixel_format); }
@@ -4959,6 +4965,9 @@ 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_Y210 : +case DRM_FORMAT_Y212 : +case DRM_FORMAT_Y216 :break ;default : DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",
@@ -13413,6 +13422,9 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : +case DRM_FORMAT_Y210 : +case DRM_FORMAT_Y212 : +case DRM_FORMAT_Y216 :case DRM_FORMAT_NV12 :if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;
@@ -14544,6 +14556,9 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,case DRM_FORMAT_UYVY :case DRM_FORMAT_YVYU :case DRM_FORMAT_VYUY : +case DRM_FORMAT_Y210 : +case DRM_FORMAT_Y212 : +case DRM_FORMAT_Y216 :if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv)) {DRM_DEBUG_KMS ("unsupported pixel format: %s\n" ,drm_get_format_name (mode_cmd->pixel_format, &format_name));
drivers/gpu/drm/i915/intel_sprite.c +3 -0
@@ -1419,6 +1419,9 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : +case DRM_FORMAT_Y210 : +case DRM_FORMAT_Y212 : +case DRM_FORMAT_Y216 :case DRM_FORMAT_NV12 :if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/4] drm/i915: Preparations for enabling Y210, Y212, Y216 formats
Hi,
Quoted 14 lines · Swati Sharma
From: Vidya Srinivas <[email protected]>
Signed-off-by Swati Sharma <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_sprite.c | 3 +++ 2 files changed, 18 insertions(+)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c static u32 skl_plane_ctl_format(uint32_t pixel_format) · line 3519
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +6
-0@@ -3511,6 +3511,12 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)return PLANE_CTL_FORMAT_YUV422 |PLANE_CTL_YUV422_VYUY ;case DRM_FORMAT_NV12 :return PLANE_CTL_FORMAT_NV12 ; +case DRM_FORMAT_Y210 : +return PLANE_CTL_FORMAT_Y210 ; +case DRM_FORMAT_Y212 : +return PLANE_CTL_FORMAT_Y212 ; +case DRM_FORMAT_Y216 : +return PLANE_CTL_FORMAT_Y216 ;
While programming YUV pixel format, you also need to program order of samples in bits [17:16] BTW 64 bits pixel format are not supported in all the planes, these are supported only in HDR planes. You should handle that as well.
-Mahesh
Quoted 38 lines
drivers/gpu/drm/i915/intel_display.c +9
-0default :MISSING_CASE (pixel_format); }@@ -4959,6 +4965,9 @@ 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_Y210 : +case DRM_FORMAT_Y212 : +case DRM_FORMAT_Y216 :break ;default : DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",@@ -13413,6 +13422,9 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : +case DRM_FORMAT_Y210 : +case DRM_FORMAT_Y212 : +case DRM_FORMAT_Y216 :case DRM_FORMAT_NV12 :if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;@@ -14544,6 +14556,9 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,case DRM_FORMAT_UYVY :case DRM_FORMAT_YVYU :case DRM_FORMAT_VYUY : +case DRM_FORMAT_Y210 : +case DRM_FORMAT_Y212 : +case DRM_FORMAT_Y216 :if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv)) {DRM_DEBUG_KMS ("unsupported pixel format: %s\n" ,drm_get_format_name (mode_cmd->pixel_format, &format_name));drivers/gpu/drm/i915/intel_sprite.c +0
-0
drivers/gpu/drm/i915/intel_sprite.c static bool skl_plane_format_mod_supported(struct drm_plane *_plane, · line 1427
Quoted 9 lines
drivers/gpu/drm/i915/intel_sprite.c +3
-0@@ -1419,6 +1419,9 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : +case DRM_FORMAT_Y210 : +case DRM_FORMAT_Y212 : +case DRM_FORMAT_Y216 :case DRM_FORMAT_NV12 :if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/4 drm/i915: Enable Y210, Y212, Y216 format for primary and sprite planes
In reply to Swati SharmaFrom: Vidya Srinivas <[email protected]>
In this patch, a list for icl specific pixel formats is created in which Y210, Y212 and Y216 pixel formats are added along with legacy pixel formats for primary and sprite plane.
--- drivers/gpu/drm/i915/intel_display.c | 25 +++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_sprite.c | 22 ++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_display.c +23 -2
@@ -104,6 +104,24 @@ DRM_FORMAT_NV12, }; +static const uint32_t icl_primary_formats[] = { +DRM_FORMAT_C8 , +DRM_FORMAT_RGB565 , +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_XRGB2101010 , +DRM_FORMAT_XBGR2101010 , +DRM_FORMAT_YUYV , +DRM_FORMAT_YVYU , +DRM_FORMAT_UYVY , +DRM_FORMAT_VYUY , +DRM_FORMAT_Y210 , +DRM_FORMAT_Y212 , +DRM_FORMAT_Y216 , +}; +static const uint64_t skl_format_modifiers_noccs[] = { I915_FORMAT_MOD_Yf_TILED,I915_FORMAT_MOD_Y_TILED ,
@@ -13718,8 +13736,11 @@ bool skl_plane_has_planar(struct drm_i915_private *dev_priv,if (INTEL_GEN (dev_priv) >=9 ) { primary->has_ccs =skl_plane_has_ccs (dev_priv, pipe,PLANE_PRIMARY ); - -if (skl_plane_has_planar (dev_priv, pipe,PLANE_PRIMARY )) { +if (INTEL_GEN (dev_priv) >=11 ) { + intel_primary_formats = icl_primary_formats; + num_formats =ARRAY_SIZE (icl_primary_formats); + }else if (skl_plane_has_planar (dev_priv, pipe, +PLANE_PRIMARY )) { intel_primary_formats = skl_pri_planar_formats; num_formats =ARRAY_SIZE (skl_pri_planar_formats); }else {
drivers/gpu/drm/i915/intel_sprite.c +20 -2
@@ -1281,6 +1281,21 @@ int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data, DRM_FORMAT_NV12, }; +static uint32_t icl_plane_formats[] = { +DRM_FORMAT_RGB565 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_YUYV , +DRM_FORMAT_YVYU , +DRM_FORMAT_UYVY , +DRM_FORMAT_VYUY , +DRM_FORMAT_Y210 , +DRM_FORMAT_Y212 , +DRM_FORMAT_Y216 , +}; +static const uint64_t skl_plane_format_modifiers_noccs[] = { I915_FORMAT_MOD_Yf_TILED,I915_FORMAT_MOD_Y_TILED ,
@@ -1536,8 +1551,11 @@ struct intel_plane * intel_plane->disable_plane = skl_disable_plane; intel_plane->get_hw_state = skl_plane_get_hw_state; -if (skl_plane_has_planar (dev_priv, pipe, -PLANE_SPRITE0 + plane)) { +if (INTEL_GEN (dev_priv) >=11 ) { + plane_formats = icl_plane_formats; + num_plane_formats =ARRAY_SIZE (icl_plane_formats); + }else if (skl_plane_has_planar (dev_priv, pipe, +PLANE_SPRITE0 + plane)) { plane_formats = skl_planar_formats; num_plane_formats =ARRAY_SIZE (skl_planar_formats); }else {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915: Enable Y210, Y212, Y216 format for primary and sprite planes
Quoted 83 lines · Swati Sharma
From: Vidya Srinivas <[email protected]>
In this patch, a list for icl specific pixel formats is created in which Y210, Y212 and Y216 pixel formats are added along with legacy pixel formats for primary and sprite plane.
Signed-off-by Swati Sharma <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 25 +++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_sprite.c | 22 ++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_display.c +23
-2@@ -104,6 +104,24 @@ DRM_FORMAT_NV12, }; +static const uint32_t icl_primary_formats[] = { +DRM_FORMAT_C8 , +DRM_FORMAT_RGB565 , +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_XRGB2101010 , +DRM_FORMAT_XBGR2101010 , +DRM_FORMAT_YUYV , +DRM_FORMAT_YVYU , +DRM_FORMAT_UYVY , +DRM_FORMAT_VYUY , +DRM_FORMAT_Y210 , +DRM_FORMAT_Y212 , +DRM_FORMAT_Y216 , +}; +static const uint64_t skl_format_modifiers_noccs[] = { I915_FORMAT_MOD_Yf_TILED,I915_FORMAT_MOD_Y_TILED ,@@ -13718,8 +13736,11 @@ bool skl_plane_has_planar(struct drm_i915_private *dev_priv,if (INTEL_GEN (dev_priv) >=9 ) { primary->has_ccs =skl_plane_has_ccs (dev_priv, pipe,PLANE_PRIMARY ); - -if (skl_plane_has_planar (dev_priv, pipe,PLANE_PRIMARY )) { +if (INTEL_GEN (dev_priv) >=11 ) { + intel_primary_formats = icl_primary_formats; + num_formats =ARRAY_SIZE (icl_primary_formats); + }else if (skl_plane_has_planar (dev_priv, pipe, +PLANE_PRIMARY )) { intel_primary_formats = skl_pri_planar_formats; num_formats =ARRAY_SIZE (skl_pri_planar_formats); }else {drivers/gpu/drm/i915/intel_sprite.c +15
-0@@ -1281,6 +1281,21 @@ int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data, DRM_FORMAT_NV12, }; +static uint32_t icl_plane_formats[] = { +DRM_FORMAT_RGB565 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_YUYV , +DRM_FORMAT_YVYU , +DRM_FORMAT_UYVY , +DRM_FORMAT_VYUY , +DRM_FORMAT_Y210 , +DRM_FORMAT_Y212 , +DRM_FORMAT_Y216 , +}; +static const uint64_t skl_plane_format_modifiers_noccs[] = { I915_FORMAT_MOD_Yf_TILED,I915_FORMAT_MOD_Y_TILED ,
drivers/gpu/drm/i915/intel_sprite.c struct intel_plane * · line 1556
Quoted 8 lines
drivers/gpu/drm/i915/intel_sprite.c +3
-2@@ -1536,8 +1551,11 @@ struct intel_plane * intel_plane->disable_plane = skl_disable_plane; intel_plane->get_hw_state = skl_plane_get_hw_state; -if (skl_plane_has_planar (dev_priv, pipe, -PLANE_SPRITE0 + plane)) { +if (INTEL_GEN (dev_priv) >=11 ) { + plane_formats = icl_plane_formats; + num_plane_formats =ARRAY_SIZE (icl_plane_formats);
64 bits pixel formats are supported only with HDR planes.
-Mahesh
drivers/gpu/drm/i915/intel_sprite.c struct intel_plane * · line 1561
Quoted 5 lines
drivers/gpu/drm/i915/intel_sprite.c +2
-0+ }else if (skl_plane_has_planar (dev_priv, pipe, +PLANE_SPRITE0 + plane)) { plane_formats = skl_planar_formats; num_plane_formats =ARRAY_SIZE (skl_planar_formats); }else {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Enable Y210, Y212, Y216 formats for ICL
In reply to Swati Sharma== Series Details ==
== Series Details ==
Series: Enable Y210, Y212, Y216 formats for ICL
URL : https://patchwork.freedesktop.org/series/48729/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
c9d04d7941bb drm: Add Y210, Y212, Y216 format definitions and fourcc
-:33: WARNING:LONG_LINE: line over 100 characters
#33: FILE: drivers/gpu/drm/drm_fourcc.c:176:
+ { .format = DRM_FORMAT_Y210, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 },-:34: WARNING:LONG_LINE: line over 100 characters
#34: FILE: drivers/gpu/drm/drm_fourcc.c:177:
+ { .format = DRM_FORMAT_Y212, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 },
-:35: WARNING:LONG_LINE: line over 100 characters
#35: FILE: drivers/gpu/drm/drm_fourcc.c:178:
+ { .format = DRM_FORMAT_Y216, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 },
-:47: WARNING:LONG_LINE_COMMENT: line over 100 characters #47: FILE: include/uapi/drm/drm_fourcc.h:152:
+#define DRM_FORMAT_Y210 fourcc_code('Y', '2', '1', '0') /* [63:0] Y0:Cb0:Y1:Cr1 10:10:10:10 little endian */
-:48: WARNING:LONG_LINE_COMMENT: line over 100 characters #48: FILE: include/uapi/drm/drm_fourcc.h:153:
+#define DRM_FORMAT_Y212 fourcc_code('Y', '2', '1', '2') /* [63:0] Y0:Cb0:Y1:Cr1 12:12:12:12 little endian */
-:49: WARNING:LONG_LINE_COMMENT: line over 100 characters #49: FILE: include/uapi/drm/drm_fourcc.h:154:
+#define DRM_FORMAT_Y216 fourcc_code('Y', '2', '1', '6') /* [63:0] Y0:Cb0:Y1:Cr1 16:16:16:16 little endian */
total: 0 errors, 6 warnings, 0 checks, 19 lines checked c5c4436ab3aa drm/i915: Add Y210, Y212, Y216 plane control definitions b21269a9abdb drm/i915: Preparations for enabling Y210, Y212, Y216 formats -:7: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one
total: 0 errors, 1 warnings, 0 checks, 48 lines checkedff10f4e6686c drm/i915: Enable Y210, Y212, Y216 format for primary and sprite planes
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Enable Y210, Y212, Y216 formats for ICL
In reply to Swati Sharma== Series Details ==
== Series Details ==
Series: Enable Y210, Y212, Y216 formats for ICL
URL : https://patchwork.freedesktop.org/series/48729/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4706 -> Patchwork_10019 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10019 need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_10019, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/48729/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10019:
=== IGT changes ===
==== Warnings ====
igt@drv_selftest@live_execlists:
fi-whl-u: SKIP -> PASS +1
{igt@kms_psr@primary_page_flip}:
fi-cnl-psr: DMESG-WARN -> DMESG-FAIL== Known issues ==
Here are the changes found in Patchwork_10019 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_guc:
fi-skl-guc: NOTRUN -> DMESG-WARN (fdo#107175, fdo#107258)
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
fi-whl-u: DMESG-FAIL (fdo#106560) -> PASS
igt@gem_exec_suspend@basic-s3:
fi-blb-e6850: INCOMPLETE -> PASS
{igt@pm_rpm@module-reload}:
fi-cnl-psr: WARN (fdo#107602) -> PASS {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#107175 https://bugs.freedesktop.org/show_bug.cgi?id=107175
fdo#107258 https://bugs.freedesktop.org/show_bug.cgi?id=107258
fdo#107602 https://bugs.freedesktop.org/show_bug.cgi?id=107602
== Participating hosts (53 -> 49) ==
Additional (1): fi-skl-guc
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4706 -> Patchwork_10019
CI_DRM_4706: 6d5687919f3a3426243041b99111b576dd0576d0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4609: 0bc9763af77bbb37f2ed65cc39c398e88db7d8e3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10019: ff10f4e6686cf96d938487319a831907cc81227c @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
ff10f4e6686c drm/i915: Enable Y210, Y212, Y216 format for primary and sprite planes b21269a9abdb drm/i915: Preparations for enabling Y210, Y212, Y216 formats c5c4436ab3aa drm/i915: Add Y210, Y212, Y216 plane control definitions c9d04d7941bb drm: Add Y210, Y212, Y216 format definitions and fourcc
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10019/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Enable Y210, Y212, Y216 formats for ICL
In reply to Swati Sharma== Series Details ==
== Series Details ==
Series: Enable Y210, Y212, Y216 formats for ICL
URL : https://patchwork.freedesktop.org/series/48729/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4706_full -> Patchwork_10019_full =
== Summary - SUCCESS ==
No regressions found.
== Known issues ==
Here are the changes found in Patchwork_10019_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_suspend@shrink:
shard-glk: PASS -> INCOMPLETE (fdo#106886, k.org#198133, fdo#103359)
igt@gem_exec_big:
shard-hsw: PASS -> INCOMPLETE (fdo#103540)
igt@kms_setmode@basic:
shard-kbl: PASS -> FAIL (fdo#99912)
==== Possible fixes ====
igt@gem_ctx_isolation@bcs0-s3:
shard-kbl: INCOMPLETE (fdo#103665) -> PASS
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-glk: FAIL (fdo#105363, fdo#102887) -> PASS fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4706 -> Patchwork_10019
CI_DRM_4706: 6d5687919f3a3426243041b99111b576dd0576d0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4609: 0bc9763af77bbb37f2ed65cc39c398e88db7d8e3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10019: ff10f4e6686cf96d938487319a831907cc81227c @ 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_10019/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx