Enable NV12 support
Subsystems (2)
v8 cover Enable NV12 support
Enabling NV12 support:
- Framebuffer creation
- Primary and Sprite plane support
Patch series depend on Enable display workaround 827 patch mentioned below submitted by Maarten
Removed BXT support for NV12 due to WA826
Changes from prev version:
Made change to skl_check_nv12_surface as required by WA#1106
Chandra Konduru (3):
drm/i915: Add NV12 support to intel_framebuffer_init drm/i915: Add NV12 as supported format for primary plane drm/i915: Add NV12 as supported format for sprite plane
Maarten Lankhorst (2):
drm/i915: Enable display workaround 827 for all planes, v2. drm/i915: Add skl_check_nv12_surface for NV12
Srinivas, Vidya (1):
drm/i915: Enable Display WA 0528
drivers/gpu/drm/i915/intel_atomic_plane.c | 7 +- drivers/gpu/drm/i915/intel_display.c | 160 ++++++++++++++++++++++++++---- drivers/gpu/drm/i915/intel_drv.h | 3 + drivers/gpu/drm/i915/intel_sprite.c | 25 ++++- 4 files changed, 171 insertions(+), 24 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 1/6 drm/i915: Enable display workaround 827 for all planes, v2.
From: Maarten Lankhorst <[email protected]>
The workaround was applied only to the primary plane, but is required on all planes. Iterate over all planes in the crtc atomic check to see if the workaround is enabled, and only perform the actual toggling in the pre/post plane update functions.
Changes since v1:
- Track active NV12 planes in a nv12_planes bitmask. (Ville)
v2: Removing BROXTON support for NV12 due to WA826
--- drivers/gpu/drm/i915/intel_atomic_plane.c | 7 ++++- drivers/gpu/drm/i915/intel_display.c | 43 +++++++++++++++++++------------ drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 33 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/intel_atomic_plane.c +6 -1
@@ -183,11 +183,16 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ }/* FIXME pre-g4x don't work like this */ -if (intel_state->base.visible) +if (state->visible) crtc_state->active_planes |=BIT (intel_plane->id);else crtc_state->active_planes &= ~BIT (intel_plane->id); +if (state->visible && state->fb->format->format ==DRM_FORMAT_NV12 ) + crtc_state->nv12_planes |=BIT (intel_plane->id); +else + crtc_state->nv12_planes &= ~BIT (intel_plane->id); + return intel_plane_atomic_calc_changes(old_crtc_state, &crtc_state->base, old_plane_state,
drivers/gpu/drm/i915/intel_display.c +26 -17
74 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -890,6 +890,7 @@ struct intel_crtc_state {/* bitmask of visible planes (enum plane_id) */ u8 active_planes; +u8 nv12_planes;/* HDMI scrambling status */ bool hdmi_scrambling;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 2/6 drm/i915: Enable Display WA 0528
In reply to Vidya SrinivasFrom: "Srinivas, Vidya" <[email protected]>
Possible hang with NV12 plane surface formats.
WA: When the plane source pixel format is NV12, the CHICKEN_PIPESL_* register bit 22 must be set to 1 and the render decompression must not be enabled on any of the planes in that pipe.
v2: removed unnecessary POSTING_READ
v3: Added RB from Maarten
v4: Removed support for NV12 for BROXTON
Credits-to: Maarten Lankhorst <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +19 -3
@@ -489,9 +489,21 @@ static const struct intel_limit intel_limits_bxt = { };static void +skl_wa_528 (struct drm_i915_private *dev_priv,int pipe,bool enable) +{ +if (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv)) +return ; + +if (enable) +I915_WRITE (CHICKEN_PIPESL_1 (pipe),HSW_FBCQ_DIS ); +else +I915_WRITE (CHICKEN_PIPESL_1 (pipe),0 ); +} + +static void skl_wa_clkgate (struct drm_i915_private *dev_priv,int pipe,bool enable) { -if (IS_SKYLAKE (dev_priv)) +if (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv))return ;if (enable)
@@ -5193,8 +5205,10 @@ static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)/* Display WA 827 */ if (needs_nv12_wa (dev_priv, old_crtc_state) && - !needs_nv12_wa (dev_priv, pipe_config)) + !needs_nv12_wa (dev_priv, pipe_config)) {skl_wa_clkgate (dev_priv, crtc->pipe, false); +skl_wa_528 (dev_priv, crtc->pipe, false); + } } static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,
@@ -5231,8 +5245,10 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,/* Display WA 827 */ if (!needs_nv12_wa (dev_priv, old_crtc_state) && -needs_nv12_wa (dev_priv, pipe_config)) +needs_nv12_wa (dev_priv, pipe_config)) {skl_wa_clkgate (dev_priv, crtc->pipe, true); +skl_wa_528 (dev_priv, crtc->pipe, true); + }/* * Vblank time updates from the shadow to live plane control register
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 3/6 drm/i915: Add skl_check_nv12_surface for NV12
In reply to Vidya SrinivasFrom: Maarten Lankhorst <[email protected]>
We skip src trunction/adjustments for
NV12 case and handle the sizes directly. Without this, pipe fifo underruns are seen on APL/KBL.
v2: For NV12, making the src coordinates multiplier of 4
v3: Moving all the src coords handling code for NV12 to skl_check_nv12_surface
v4: Added RB from Mika
v5: Rebased the series. Removed checks of mult of 4 in skl_update_scaler, Added NV12 condition in intel_check_sprite_plane where src x/w is being checked for mult of 2 for yuv planes.
v6: Made changes to skl_check_nv12_surface as per WA#1106
--- drivers/gpu/drm/i915/intel_display.c | 29 +++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_sprite.c | 1 + 2 files changed, 28 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +27 -2
@@ -3102,6 +3102,29 @@ static int skl_check_main_surface(const struct intel_crtc_state *crtc_state,return 0 ; } +static int +skl_check_nv12_surface (const struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state) +{ +/* Display WA #1106 */ +if (plane_state->base.rotation != + (DRM_MODE_REFLECT_X |DRM_MODE_ROTATE_90 ) && + plane_state->base.rotation !=DRM_MODE_ROTATE_270 ) +return 0 ; + +/* +* src coordinates are rotated here. +* We check height but report it as width +*/ +if (((drm_rect_height (&plane_state->base.src) >>16 ) %4 ) !=0 ) { +DRM_DEBUG_KMS ("src width must be multiple " +"of 4 for rotated NV12\n" ); +return -EINVAL ; + } + +return 0 ; +} +static int skl_check_nv12_aux_surface (struct intel_plane_state *plane_state) {const struct drm_framebuffer *fb = plane_state->base.fb;
@@ -3185,6 +3208,9 @@ int skl_check_plane_surface(const struct intel_crtc_state *crtc_state,* the main surface setup depends on it. */ if (fb->format->format ==DRM_FORMAT_NV12 ) { + ret =skl_check_nv12_surface (crtc_state, plane_state); +if (ret) +return ret; ret =skl_check_nv12_aux_surface (plane_state);if (ret)return ret;
@@ -4806,8 +4832,7 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach, }if (plane_scaler_check && pixel_format ==DRM_FORMAT_NV12 && - (src_h <SKL_MIN_YUV_420_SRC_H || (src_w %4 ) !=0 || - (src_h %4 ) !=0 )) { + (src_h <SKL_MIN_YUV_420_SRC_H || src_w <SKL_MIN_YUV_420_SRC_W )) {DRM_DEBUG_KMS ("NV12: src dimensions not met\n" );return -EINVAL ; }
drivers/gpu/drm/i915/intel_sprite.c +1 -0
@@ -1011,6 +1011,7 @@ intel_check_sprite_plane(struct intel_plane *plane, src->y2 = (src_y + src_h) <<16 ;if (intel_format_is_yuv (fb->format->format) && + fb->format->format !=DRM_FORMAT_NV12 && (src_x %2 || src_w %2 )) {DRM_DEBUG_KMS ("src x/w (%u, %u) must be a multiple of 2 for YUV planes\n" , src_x, src_w);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v8 3/6] drm/i915: Add skl_check_nv12_surface for NV12
Op 11-05-18 om 23:33 schreef Vidya Srinivas:
Quoted 17 lines
From: Maarten Lankhorst <[email protected]>
We skip src trunction/adjustments for
NV12 case and handle the sizes directly. Without this, pipe fifo underruns are seen on APL/KBL.v2: For NV12, making the src coordinates multiplier of 4
v3: Moving all the src coords handling code for NV12 to
skl_check_nv12_surfacev4: Added RB from Mika
v5: Rebased the series. Removed checks of mult of 4 in
skl_update_scaler, Added NV12 condition inintel_check_sprite_planewhere src x/w is being checked for mult of 2 for yuv planes.
Quoted 5 lines
v6: Made changes to
skl_check_nv12_surfaceas per WA#1106Reviewed-by Mika Kahola <[email protected]>Signed-off-by Maarten Lankhorst <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>
Thanks, pushed the series to DINQ. :)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v8 3/6] drm/i915: Add skl_check_nv12_surface for NV12
Quoted 27 lines
-----Original Message-----
From: Maarten Lankhorst [mailto:[email protected]]
Sent: Friday, May 11, 2018 1:50 PM
To: Srinivas, Vidya <[email protected]>; intel- [email protected]
Subject: Re: [PATCH v8 3/6] drm/i915: Addskl_check_nv12_surfacefor NV12Op 11-05-18 om 23:33 schreef Vidya Srinivas:
Quoted 17 lines
From: Maarten Lankhorst <[email protected]>
We skip src trunction/adjustments for
NV12 case and handle the sizes directly. Without this, pipe fifo underruns are seen on APL/KBL.v2: For NV12, making the src coordinates multiplier of 4
v3: Moving all the src coords handling code for NV12 to
skl_check_nv12_surfacev4: Added RB from Mika
v5: Rebased the series. Removed checks of mult of 4 in
skl_update_scaler, Added NV12 condition inintel_check_sprite_planewhere src x/w is being checked for mult of 2 for yuv planes.
Quoted 6 lines
Quoted 5 lines
v6: Made changes to
skl_check_nv12_surfaceas per WA#1106Reviewed-by Mika Kahola <[email protected]>Signed-off-by Maarten Lankhorst <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>Thanks, pushed the series to DINQ. :)
Thank you so much :)
Regards
Vidya
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 4/6 drm/i915: Add NV12 support to intel_framebuffer_init
In reply to Vidya SrinivasFrom: Chandra Konduru <[email protected]>
This patch adds NV12 as supported format
to intel_framebuffer_init and performs various checks.
v2:
-Fix an issue in checks added (Chandra Konduru)
v3: rebased (me)
v4: Review comments by Ville addressed
Added platform check for NV12 in intel_framebuffer_init Removed offset checks for NV12 case
v5: Addressed review comments by Clinton A Taylor
This NV12 support only correctly works on SKL.
Plane color space conversion is different on GLK and later platforms causing the colors to display incorrectly.
Ville's plane color space property patch series
in review will fix this issue.
- Restricted the NV12 case in intel_framebuffer_init to SKL and BXT only.
v6: Rebased (me)
v7: Addressed review comments by Ville
Restricting the NV12 to BXT for now.
v8: Rebased (me)
Restricting the NV12 changes to BXT and KBL for now.
v9: Rebased (me)
v10: NV12 supported by all GEN >= 9.
Making this change in intel_framebuffer_init. This is part of addressing Maarten's review comments. Comment under v8 no longer applicable
v11: Addressed review comments from Shashank Sharma
v12: Adding Reviewed By from Shashank Sharma
v13: Addressed review comments from Juha-Pekka Heikkila "NV12 not to be supported by SKL"
v14: Addressed review comments from Maarten. Add checks for fb width height for NV12 and fail the fb creation if check fails. Added reviewed by from Juha-Pekka Heikkila
v15: Rebased the series
v16: Setting the minimum value during fb creating to 16 as per Bspec for NV12. Earlier minimum was expected to be > 16. Now changed it to >=16.
v17: Adding restriction to framebuffer_init - the fb width and height should be a multiplier of 4
v18: Added RB from Maarten. Included Maarten's review comments Dont allow CCS formats for fb creation of NV12
v19: Review comments from Maarten addressed -
Removing BROXTON support for NV12 due to WA826
Credits-to: Maarten Lankhorst <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
drivers/gpu/drm/i915/intel_display.c +22 -0
@@ -14291,6 +14291,20 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, goto err; }break ; +case DRM_FORMAT_NV12 : +if (mode_cmd->modifier[0 ] ==I915_FORMAT_MOD_Y_TILED_CCS || + mode_cmd->modifier[0 ] == I915_FORMAT_MOD_Yf_TILED_CCS) { +DRM_DEBUG_KMS ("RC not to be enabled with NV12\n" ); + goto err; + } +if (INTEL_GEN (dev_priv) <9 ||IS_SKYLAKE (dev_priv) || +IS_BROXTON (dev_priv)) { +DRM_DEBUG_KMS ("unsupported pixel format: %s\n" , +drm_get_format_name (mode_cmd->pixel_format, + &format_name)); + goto err; + } +break ;default :DRM_DEBUG_KMS ("unsupported pixel format: %s\n" ,drm_get_format_name (mode_cmd->pixel_format, &format_name));
@@ -14303,6 +14317,14 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,drm_helper_mode_fill_fb_struct (&dev_priv->drm, fb, mode_cmd); +if (fb->format->format ==DRM_FORMAT_NV12 && + (fb->width <SKL_MIN_YUV_420_SRC_W || + fb->height <SKL_MIN_YUV_420_SRC_H || + (fb->width %4 ) !=0 || (fb->height %4 ) !=0 )) { +DRM_DEBUG_KMS ("src dimensions not correct for NV12\n" ); +return -EINVAL ; + } +for (i =0 ; i < fb->format->num_planes; i++) {u32 stride_alignment;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v8 4/6] drm/i915: Add NV12 support to intel_framebuffer_init
Quoted 104 lines · Vidya Srinivas
From: Chandra Konduru <[email protected]>
This patch adds NV12 as supported format
tointel_framebuffer_initand performs various checks.v2:
-Fix an issue in checks added (Chandra Konduru)v3: rebased (me)
v4: Review comments by Ville addressed
Added platform check for NV12 inintel_framebuffer_initRemoved offset checks for NV12 casev5: Addressed review comments by Clinton A Taylor
This NV12 support only correctly works on SKL.
Plane color space conversion is different on GLK and later platforms causing the colors to display incorrectly.
Ville's plane color space property patch series
in review will fix this issue.
- Restricted the NV12 case inintel_framebuffer_initto SKL and BXT only.v6: Rebased (me)
v7: Addressed review comments by Ville
Restricting the NV12 to BXT for now.v8: Rebased (me)
Restricting the NV12 changes to BXT and KBL for now.v9: Rebased (me)
v10: NV12 supported by all GEN >= 9.
Making this change inintel_framebuffer_init. This is part of addressing Maarten's review comments. Comment under v8 no longer applicablev11: Addressed review comments from Shashank Sharma
v12: Adding Reviewed By from Shashank Sharma
v13: Addressed review comments from Juha-Pekka Heikkila "NV12 not to be supported by SKL"
v14: Addressed review comments from Maarten. Add checks for fb width height for NV12 and fail the fb creation if check fails. Added reviewed by from Juha-Pekka Heikkila
v15: Rebased the series
v16: Setting the minimum value during fb creating to 16 as per Bspec for NV12. Earlier minimum was expected to be > 16. Now changed it to >=16.
v17: Adding restriction to
framebuffer_init- the fb width and height should be a multiplier of 4v18: Added RB from Maarten. Included Maarten's review comments Dont allow CCS formats for fb creation of NV12
v19: Review comments from Maarten addressed -
Removing BROXTON support for NV12 due to WA826Credits-to: Maarten Lankhorst <[email protected]>
Tested-by Clinton Taylor <[email protected]>Reviewed-by Maarten Lankhorst <[email protected]>Reviewed-by Shashank Sharma <[email protected]>Reviewed-by Clinton Taylor <[email protected]>Reviewed-by Juha-Pekka Heikkila <[email protected]>Signed-off-by Chandra Konduru <[email protected]>Signed-off-by Nabendu Maiti <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)drivers/gpu/drm/i915/intel_display.c +14
-0@@ -14291,6 +14291,20 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, goto err; }break ; +case DRM_FORMAT_NV12 : +if (mode_cmd->modifier[0 ] ==I915_FORMAT_MOD_Y_TILED_CCS || + mode_cmd->modifier[0 ] == I915_FORMAT_MOD_Yf_TILED_CCS) { +DRM_DEBUG_KMS ("RC not to be enabled with NV12\n" ); + goto err; + } +if (INTEL_GEN (dev_priv) <9 ||IS_SKYLAKE (dev_priv) || +IS_BROXTON (dev_priv)) { +DRM_DEBUG_KMS ("unsupported pixel format: %s\n" , +drm_get_format_name (mode_cmd->pixel_format, + &format_name)); + goto err; + } +break ;default :DRM_DEBUG_KMS ("unsupported pixel format: %s\n" ,drm_get_format_name (mode_cmd->pixel_format, &format_name));
drivers/gpu/drm/i915/intel_display.c static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, · line 14325
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +6
-0@@ -14303,6 +14317,14 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,drm_helper_mode_fill_fb_struct (&dev_priv->drm, fb, mode_cmd); +if (fb->format->format ==DRM_FORMAT_NV12 && + (fb->width <SKL_MIN_YUV_420_SRC_W || + fb->height <SKL_MIN_YUV_420_SRC_H || + (fb->width %4 ) !=0 || (fb->height %4 ) !=0 )) { +DRM_DEBUG_KMS ("src dimensions not correct for NV12\n" ); +return -EINVAL ;
Shouldn't this be 'goto err'? All other early exits before and after this do the goto to get the reference count clean up.
drivers/gpu/drm/i915/intel_display.c static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, · line 14330
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +2
-0+ } +for (i =0 ; i < fb->format->num_planes; i++) {u32 stride_alignment;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 5/6 drm/i915: Add NV12 as supported format for primary plane
In reply to Vidya SrinivasFrom: Chandra Konduru <[email protected]>
This patch adds NV12 to list of supported formats for primary plane
v2: Rebased (Chandra Konduru)
v3: Rebased (me)
v4: Review comments by Ville addressed
Removed the skl_primary_formats_with_nv12 and
added NV12 case in existing skl_primary_formats
v5: Rebased (me)
v6: Missed the Tested-by/Reviewed-by in the previous series Adding the same to commit message in this version.
v7: Review comments by Ville addressed
Restricting the NV12 for BXT and on PIPE A and B
Rebased (me)
v8: Rebased (me)
Modified restricting the NV12 support for both BXT and KBL.
v9: Rebased (me)
v10: Addressed review comments from Maarten.
Adding NV12 inside skl_primary_formats itself.
v11: Adding Reviewed By tag from Shashank Sharma
v12: Addressed review comments from Juha-Pekka Heikkila "NV12 not to be supported by SKL"
v13: Addressed review comments from Ville
Added skl_pri_planar_formats to include NV12
and skl_plane_has_planar function to check for
NV12 support on plane. Added NV12 format toskl_mod_supported. These were review comments
from Kristian Høgsberg <[email protected]>
v14: Added reviewed by from Juha-Pekka Heikkila
v15: Rebased the series
v16: Added all tiling support under mod supported
for NV12. Credits to Megha Aggarwal
v17: Added RB by Maarten and Kristian
v18: Review comments from Maarten addressed -
Removing BROXTON support for NV12 due to WA826
v19: Addressed review comments from Maarten
Make changes to skl_mod_supported
Credits-to: Megha Aggarwal [email protected]
Credits-to: Maarten Lankhorst <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 50 ++++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 2 ++ 2 files changed, 50 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +48 -2
@@ -88,6 +88,22 @@ static const uint32_t skl_primary_formats[] = { DRM_FORMAT_VYUY, }; +static const uint32_t skl_pri_planar_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_NV12 , +}; +static const uint64_t skl_format_modifiers_noccs[] = { I915_FORMAT_MOD_Yf_TILED,I915_FORMAT_MOD_Y_TILED ,
@@ -13202,6 +13218,7 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV12 :if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;/* fall through */
@@ -13409,6 +13426,30 @@ static bool skl_plane_has_fbc(struct drm_i915_private *dev_priv,return pipe ==PIPE_A && plane_id ==PLANE_PRIMARY ; } +bool skl_plane_has_planar (struct drm_i915_private *dev_priv, +enum pipe pipe,enum plane_id plane_id) +{ +if (plane_id ==PLANE_PRIMARY ) { +if (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv)) +return false; +else if ((INTEL_GEN (dev_priv) ==9 && pipe ==PIPE_C ) && + !IS_GEMINILAKE (dev_priv)) +return false; + }else if (plane_id >=PLANE_SPRITE0 ) { +if (plane_id ==PLANE_CURSOR ) +return false; +if (IS_GEMINILAKE (dev_priv) ||INTEL_GEN (dev_priv) ==10 ) { +if (plane_id !=PLANE_SPRITE0 ) +return false; + }else { +if (plane_id !=PLANE_SPRITE0 || pipe ==PIPE_C || +IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv)) +return false; + } + } +return true; +} +static struct intel_plane *intel_primary_plane_create (struct drm_i915_private *dev_priv,enum pipe pipe) {
@@ -13469,8 +13510,13 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) primary->check_plane = intel_check_primary_plane;if (INTEL_GEN (dev_priv) >=9 ) { - intel_primary_formats = skl_primary_formats; - num_formats =ARRAY_SIZE (skl_primary_formats); +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 { + intel_primary_formats = skl_primary_formats; + num_formats =ARRAY_SIZE (skl_primary_formats); + }if (skl_plane_has_ccs (dev_priv, pipe,PLANE_PRIMARY )) modifiers = skl_format_modifiers_ccs;
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -2076,6 +2076,8 @@ bool skl_plane_get_hw_state(struct intel_plane *plane);bool skl_plane_has_ccs (struct drm_i915_private *dev_priv,enum pipe pipe,enum plane_id plane_id);bool intel_format_is_yuv (uint32_t format); +bool skl_plane_has_planar (struct drm_i915_private *dev_priv, +enum pipe pipe,enum plane_id plane_id);/* intel_tv.c */ void intel_tv_init (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 6/6 drm/i915: Add NV12 as supported format for sprite plane
In reply to Vidya SrinivasFrom: Chandra Konduru <[email protected]>
This patch adds NV12 to list of supported formats for sprite plane.
v2: Rebased (me)
v3: Review comments by Ville addressed
- Removed skl_plane_formats_with_nv12 and added
NV12 case in existing skl_plane_formats
- Added the 10bpc RGB formats
v4: Addressed review comments from Clinton A Taylor
"Why are we adding 10 bit RGB formats with the NV12 series patches? Trying to set XR30 or AB30 results in error returned even though the modes are advertised for the planes"
- Removed 10bit RGB formats added previously with NV12 series
v5: Missed the Tested-by/Reviewed-by in the previous series Adding the same to commit message in this version. Addressed review comments from Clinton A Taylor
"Why are we adding 10 bit RGB formats with the NV12 series patches? Trying to set XR30 or AB30 results in error returned even though the modes are advertised for the planes"
- Previous version has 10bit RGB format removed from VLV formats by mistake. Fixing that in this version.
Removed 10bit RGB formats added previously with NV12 series for SKL.
v6: Addressed review comments by Ville
Restricting the NV12 to BXT and PIPE A and B
v7: Rebased (me)
v8: Rebased (me)
Restricting NV12 changes to BXT and KBL
Restricting NV12 changes for plane 0 (overlay)
v9: Rebased (me)
v10: Addressed review comments from Maarten.
Adding NV12 to skl_plane_formats itself.
v11: Addressed review comments from Shashank Sharma
v12: Addressed review comments from Shashank Sharma Made the condition in intel_sprite_plane_create simple and easy to read as suggested.
v13: Adding reviewed by tag from Shashank Sharma Addressed review comments from Juha-Pekka Heikkila "NV12 not to be supported by SKL"
v14: Addressed review comments from Ville
Added skl_planar_formats to include NV12
and a check skl_plane_has_planar in sprite create Added NV12 format to skl_mod_supported. These were review comments from Kristian Høgsberg <[email protected]>
v15: Added reviewed by from Juha-Pekka Heikkila
v16: Rebased the series
v17: Added all tiling under mod supported for NV12 Credits to Megha Aggarwal
v18: Added RB by Maarten and Kristian
v19: Addressed review comments from Maarten
Made modification to skl_mod_supported
Credits-to: Megha Aggarwal <[email protected]>
Credits-to: Kristian Høgsberg <[email protected]>
--- drivers/gpu/drm/i915/intel_sprite.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_sprite.c +22 -2
@@ -1180,6 +1180,19 @@ static uint32_t skl_plane_formats[] = { DRM_FORMAT_VYUY, }; +static uint32_t skl_planar_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_NV12 , +}; +static const uint64_t skl_plane_format_modifiers_noccs[] = { I915_FORMAT_MOD_Yf_TILED,I915_FORMAT_MOD_Y_TILED ,
@@ -1274,6 +1287,7 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV12 :if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;/* fall through */
@@ -1373,8 +1387,14 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, intel_plane->disable_plane = skl_disable_plane; intel_plane->get_hw_state = skl_plane_get_hw_state; - plane_formats = skl_plane_formats; - num_plane_formats =ARRAY_SIZE (skl_plane_formats); +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 { + plane_formats = skl_plane_formats; + num_plane_formats =ARRAY_SIZE (skl_plane_formats); + }if (skl_plane_has_ccs (dev_priv, pipe,PLANE_SPRITE0 + plane)) modifiers = skl_plane_format_modifiers_ccs;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Enable NV12 support (rev6)
In reply to Vidya Srinivas== Series Details ==
== Series Details ==
Series: Enable NV12 support (rev6)
URL : https://patchwork.freedesktop.org/series/41674/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4152 -> Patchwork_8932 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/41674/revisions/6/mbox/
== Known issues ==
Here are the changes found in Patchwork_8932 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-hsw-4200u: PASS -> FAIL (fdo#100368)
igt@kms_frontbuffer_tracking@basic:
fi-hsw-4200u: PASS -> DMESG-FAIL (fdo#102614, fdo#106103)
==== Possible fixes ====
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-skl-6770hq: FAIL (fdo#100368, fdo#103928) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
fdo#106103 https://bugs.freedesktop.org/show_bug.cgi?id=106103
== Participating hosts (41 -> 37) ==
Missing (4): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4152 -> Patchwork_8932
CI_DRM_4152: 06e15c0f055b8b8e326bb65fa83f69b1b7391e51 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4464: 1bb318b32db003a377da14715c7b80675a712b6b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8932: 8ed55fec3a1cd6d018ae8f392744cb49c0de0be6 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4464: 33e58d5583eb7ed3966a1b905f875a1dfa959f6b @ git://anongit.freedesktop.org/piglit
== Linux commits ==
8ed55fec3a1c drm/i915: Add NV12 as supported format for sprite plane 4f3dbd32ac39 drm/i915: Add NV12 as supported format for primary plane 47db37f2bc68 drm/i915: Add NV12 support to intel_framebuffer_init 53c609a50ded drm/i915: Add skl_check_nv12_surface for NV12 3bb8c22c799b drm/i915: Enable Display WA 0528df7ef5673726 drm/i915: Enable display workaround 827 for all planes, v2.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8932/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Enable NV12 support (rev6)
In reply to Vidya Srinivas== Series Details ==
== Series Details ==
Series: Enable NV12 support (rev6)
URL : https://patchwork.freedesktop.org/series/41674/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4152_full -> Patchwork_8932_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_8932_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_8932_full, 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/41674/revisions/6/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_8932_full:
=== IGT changes ===
==== Warnings ====
igt@kms_force_connector_basic@force-load-detect:
shard-hsw: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_8932_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@absolute-wf_vblank-interruptible:
shard-apl: PASS -> FAIL (fdo#106087)
igt@kms_flip@plain-flip-ts-check:
shard-hsw: PASS -> FAIL (fdo#100368) +1
==== Possible fixes ====
igt@drv_selftest@live_contexts:
shard-kbl: INCOMPLETE (fdo#103665) -> PASS
igt@kms_flip@2x-plain-flip-fb-recreate:
shard-hsw: FAIL (fdo#100368) -> PASS
igt@kms_flip@dpms-vs-vblank-race-interruptible:
shard-hsw: FAIL (fdo#103060) -> PASS
igt@kms_flip@wf_vblank-ts-check-interruptible:
shard-glk: FAIL (fdo#100368) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#106087 https://bugs.freedesktop.org/show_bug.cgi?id=106087
== Participating hosts (6 -> 6) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4152 -> Patchwork_8932
CI_DRM_4152: 06e15c0f055b8b8e326bb65fa83f69b1b7391e51 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4464: 1bb318b32db003a377da14715c7b80675a712b6b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8932: 8ed55fec3a1cd6d018ae8f392744cb49c0de0be6 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4464: 33e58d5583eb7ed3966a1b905f875a1dfa959f6b @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8932/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx