Enable NV12 support
Subsystems (2)
v2 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
Chandra Konduru (3):
drm/i915: Add NV12 as supported format for primary plane drm/i915: Add NV12 as supported format for sprite plane drm/i915: Add NV12 support to intel_framebuffer_init
Maarten Lankhorst (1):
drm/i915: Enable display workaround 827 for all planes, v2.
Vidya Srinivas (2):
drm/i915: Enable Display WA 0528
drm/i915: Do not do fb src adjustments for NV12
drivers/gpu/drm/i915/intel_atomic_plane.c | 7 +- drivers/gpu/drm/i915/intel_display.c | 136 ++++++++++++++++++++++++++---- drivers/gpu/drm/i915/intel_drv.h | 3 + drivers/gpu/drm/i915/intel_sprite.c | 44 +++++++++- 4 files changed, 169 insertions(+), 21 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 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)
--- drivers/gpu/drm/i915/intel_atomic_plane.c | 7 +++++- drivers/gpu/drm/i915/intel_display.c | 40 ++++++++++++++++++------------- drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 30 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 +23 -17
@@ -5138,6 +5138,19 @@ static bool hsw_post_update_enable_ips(const struct intel_crtc_state *old_crtc_sreturn !old_crtc_state->ips_enabled; } +static bool needs_nv12_wa (struct drm_i915_private *dev_priv, +const struct intel_crtc_state *crtc_state) +{ +if (!crtc_state->nv12_planes) +return false; + +if ((INTEL_GEN (dev_priv) ==9 && !IS_GEMINILAKE (dev_priv)) || +IS_CANNONLAKE (dev_priv)) +return true; + +return false; +} +static void intel_post_plane_update (struct intel_crtc_state *old_crtc_state) {struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc);
@@ -5162,7 +5175,6 @@ static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)if (old_primary_state) {struct drm_plane_state *new_primary_state =drm_atomic_get_new_plane_state (old_state, primary); -struct drm_framebuffer *fb = new_primary_state->fb;intel_fbc_post_update (crtc);
@@ -5170,15 +5182,12 @@ static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state) (needs_modeset(&pipe_config->base) || !old_primary_state->visible))intel_post_enable_primary (&crtc->base, pipe_config); - -/* Display WA 827 */ -if ((INTEL_GEN (dev_priv) ==9 && !IS_GEMINILAKE (dev_priv)) || -IS_CANNONLAKE (dev_priv)) { -if (fb && fb->format->format ==DRM_FORMAT_NV12 ) -skl_wa_clkgate (dev_priv, crtc->pipe, false); - } - } + +/* Display WA 827 */ +if (needs_nv12_wa (dev_priv, old_crtc_state) && + !needs_nv12_wa (dev_priv, pipe_config)) +skl_wa_clkgate (dev_priv, crtc->pipe, false); } static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,
@@ -5202,14 +5211,6 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,struct intel_plane_state *new_primary_state =intel_atomic_get_new_plane_state (old_intel_state,to_intel_plane (primary)); -struct drm_framebuffer *fb = new_primary_state->base.fb; - -/* Display WA 827 */ -if ((INTEL_GEN (dev_priv) ==9 && !IS_GEMINILAKE (dev_priv)) || -IS_CANNONLAKE (dev_priv)) { -if (fb && fb->format->format ==DRM_FORMAT_NV12 ) -skl_wa_clkgate (dev_priv, crtc->pipe, true); - }intel_fbc_pre_update (crtc, pipe_config, new_primary_state);/*
@@ -5221,6 +5222,11 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,intel_set_cpu_fifo_underrun_reporting (dev_priv, crtc->pipe, false); } +/* Display WA 827 */ +if (!needs_nv12_wa (dev_priv, old_crtc_state) && +needs_nv12_wa (dev_priv, pipe_config)) +skl_wa_clkgate (dev_priv, crtc->pipe, true); +/* * Vblank time updates from the shadow to live plane control register * are blocked if the memory self-refresh mode is active at that
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -882,6 +882,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 v2 2/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
Credits-to: Megha Aggarwal [email protected]
--- drivers/gpu/drm/i915/intel_display.c | 55 ++++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 2 ++ 2 files changed, 55 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +53 -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 ,
@@ -13124,6 +13140,12 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;/* fall through */ +case DRM_FORMAT_NV12 : +if (modifier ==DRM_FORMAT_MOD_LINEAR || + modifier ==I915_FORMAT_MOD_X_TILED || + modifier ==I915_FORMAT_MOD_Y_TILED || + modifier == I915_FORMAT_MOD_Yf_TILED) +return true;case DRM_FORMAT_C8 : if (modifier == DRM_FORMAT_MOD_LINEAR || modifier == I915_FORMAT_MOD_X_TILED ||
@@ -13328,6 +13350,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)) +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)) +return false; + } + } +return true; +} +static struct intel_plane *intel_primary_plane_create (struct drm_i915_private *dev_priv,enum pipe pipe) {
@@ -13388,8 +13434,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
@@ -2063,6 +2063,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
Re: [PATCH v2 2/6] drm/i915: Add NV12 as supported format for primary plane
Quoted 4 lines · Vidya Srinivas
From: Chandra Konduru <[email protected]>
This patch adds NV12 to list of supported formats for primary plane
Quoted 52 lines
v2: Rebased (Chandra Konduru)
v3: Rebased (me)
v4: Review comments by Ville addressed
Removed theskl_primary_formats_with_nv12and
added NV12 case in existingskl_primary_formatsv5: 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 insideskl_primary_formatsitself.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
Addedskl_pri_planar_formatsto include NV12
andskl_plane_has_planarfunction 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 AggarwalCredits-to: Megha Aggarwal [email protected]
Tested-by Clinton Taylor <[email protected]>Reviewed-by Juha-Pekka Heikkila <[email protected]>Reviewed-by Clinton Taylor <[email protected]>Reviewed-by Shashank Sharma <[email protected]>Signed-off-by Chandra Konduru <[email protected]>Signed-off-by Nabendu Maiti <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>
Quoted 2 lines
--- drivers/gpu/drm/i915/intel_display.c | 55
++++++++++++++++++++++++++++++++++--
Review
Quoted 4 lines
drivers/gpu/drm/i915/intel_drv.h | 2 ++ 2 files changed, 55 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_display.c static bool skl_mod_supported(uint32_t format,
Quoted 27 lines
index 22c8a7d..1a0fae9 100644
drivers/gpu/drm/i915/intel_display.c +16
-0@@ -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 ,@@ -13124,6 +13140,12 @@ static bool skl_mod_supported(uint32_t format,
uint64_t modifier)
drivers/gpu/drm/i915/intel_display.c static bool skl_plane_has_fbc(struct
Quoted 13 lines
drivers/gpu/drm/i915/intel_display.c +6
-0if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;/* fall through */ +case DRM_FORMAT_NV12 : +if (modifier ==DRM_FORMAT_MOD_LINEAR || + modifier ==I915_FORMAT_MOD_X_TILED || + modifier ==I915_FORMAT_MOD_Y_TILED || + modifier == I915_FORMAT_MOD_Yf_TILED) +return true;case DRM_FORMAT_C8 : if (modifier == DRM_FORMAT_MOD_LINEAR || modifier == I915_FORMAT_MOD_X_TILED ||@@ -13328,6 +13350,30 @@ static bool skl_plane_has_fbc(struct
drm_i915_private *dev_priv,
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +3
-0return 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) +{
drivers/gpu/drm/i915/intel_display.c static bool skl_plane_has_fbc(struct drm_i915_private *dev_priv,
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+if (plane_id ==PLANE_PRIMARY ) { +if (IS_SKYLAKE (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 )
{
drivers/gpu/drm/i915/intel_display.c static bool skl_plane_has_fbc(struct drm_i915_private *dev_priv,
Quoted 13 lines
drivers/gpu/drm/i915/intel_display.c +11
-0+if (plane_id !=PLANE_SPRITE0 ) +return false; + }else { +if (plane_id !=PLANE_SPRITE0 || pipe ==PIPE_C || +IS_SKYLAKE (dev_priv)) +return false; + } + } +return true; +} +static struct intel_plane * intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe
pipe)
drivers/gpu/drm/i915/intel_display.c intel_primary_plane_create(struct
Quoted 2 lines
drivers/gpu/drm/i915/intel_display.c +0
-0{@@ -13388,8 +13434,13 @@ intel_primary_plane_create(struct
drm_i915_private *dev_priv, enum pipe pipe)
Review
Quoted 16 lines
drivers/gpu/drm/i915/intel_display.c +7
-2primary->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;(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_drv.h bool skl_plane_get_hw_state(struct intel_plane
Quoted 4 lines
index d8930676..01352ef 100644
drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -2063,6 +2063,8 @@ bool skl_plane_get_hw_state(struct intel_plane
*plane);
Quoted 11 lines
drivers/gpu/drm/i915/intel_drv.h +2
-1bool 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); --2.7.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/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
Credits-to: Megha Aggarwal <[email protected]>
Credits-to: Kristian Høgsberg <[email protected]>
--- drivers/gpu/drm/i915/intel_sprite.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_sprite.c +27 -2
@@ -1253,6 +1253,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 ,
@@ -1350,6 +1363,12 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;/* fall through */ +case DRM_FORMAT_NV12 : +if (modifier ==DRM_FORMAT_MOD_LINEAR || + modifier ==I915_FORMAT_MOD_X_TILED || + modifier ==I915_FORMAT_MOD_Y_TILED || + modifier == I915_FORMAT_MOD_Yf_TILED) +return true;case DRM_FORMAT_C8 : if (modifier == DRM_FORMAT_MOD_LINEAR || modifier == I915_FORMAT_MOD_X_TILED ||
@@ -1446,8 +1465,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
Re: [PATCH v2 3/6] drm/i915: Add NV12 as supported format for sprite plane
Quoted 74 lines · Vidya Srinivas
From: 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
- Removedskl_plane_formats_with_nv12and added
NV12 case in existingskl_plane_formats
- Added the 10bpc RGB formatsv4: 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 seriesv5: 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 Bv7: 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 toskl_plane_formatsitself.v11: Addressed review comments from Shashank Sharma
v12: Addressed review comments from Shashank Sharma Made the condition in
intel_sprite_plane_createsimple 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
Addedskl_planar_formatsto include NV12
and a checkskl_plane_has_planarin sprite create Added NV12 format toskl_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
Credits-to: Megha Aggarwal <[email protected]>
Credits-to: Kristian Høgsberg <[email protected]>Tested-by Clinton Taylor <[email protected]>Reviewed-by Juha-Pekka Heikkila <[email protected]>Reviewed-by Shashank Sharma <[email protected]>Reviewed-by Clinton Taylor <[email protected]>Signed-off-by Chandra Konduru <[email protected]>Signed-off-by Nabendu Maiti <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>
Review
Quoted 5 lines
--- drivers/gpu/drm/i915/intel_sprite.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_sprite.c
drivers/gpu/drm/i915/intel_sprite.c static bool skl_mod_supported(uint32_t format,
Quoted 24 lines
index aa1dfaa..8b7947d 100644
drivers/gpu/drm/i915/intel_sprite.c +13
-0@@ -1253,6 +1253,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 ,@@ -1350,6 +1363,12 @@ static bool skl_mod_supported(uint32_t format,
uint64_t modifier)
drivers/gpu/drm/i915/intel_sprite.c static bool skl_mod_supported(uint32_t format, uint64_t modifier) · line 1371
Quoted 9 lines
drivers/gpu/drm/i915/intel_sprite.c +6
-0if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;/* fall through */ +case DRM_FORMAT_NV12 : +if (modifier ==DRM_FORMAT_MOD_LINEAR || + modifier ==I915_FORMAT_MOD_X_TILED || + modifier ==I915_FORMAT_MOD_Y_TILED || + modifier == I915_FORMAT_MOD_Yf_TILED) +return true;
Thanks for adding the modifier support.
drivers/gpu/drm/i915/intel_sprite.c intel_sprite_plane_create(struct drm_i915_private
Quoted 4 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-0case DRM_FORMAT_C8 : if (modifier == DRM_FORMAT_MOD_LINEAR || modifier == I915_FORMAT_MOD_X_TILED ||@@ -1446,8 +1465,14 @@ intel_sprite_plane_create(struct drm_i915_private
*dev_priv,
drivers/gpu/drm/i915/intel_sprite.c intel_sprite_plane_create(struct drm_i915_private *dev_priv,
Quoted 9 lines
drivers/gpu/drm/i915/intel_sprite.c +4
-2intel_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);
drivers/gpu/drm/i915/intel_sprite.c intel_sprite_plane_create(struct drm_i915_private *dev_priv,
Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c +4
-0+ }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))
Quoted 8 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-1modifiers = skl_plane_format_modifiers_ccs; --2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/6] drm/i915: Add NV12 as supported format for sprite plane
Thank you so much. I had included your name also under credits-to I will add your RB before merging.
Regards
Vidya
Quoted 145 lines
-----Original Message-----
From: Kristian Høgsberg [mailto:[email protected]]
Sent: Friday, April 13, 2018 9:44 PM
To: Srinivas, Vidya <[email protected]>
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH v2 3/6] drm/i915: Add NV12 as supported format for sprite planeQuoted 4 lines · Vidya Srinivas
From: Chandra Konduru <[email protected]>
This patch adds NV12 to list of supported formats for sprite plane.
Quoted 8 lines
v2: Rebased (me)
v3: Review comments by Ville addressed
- Removedskl_plane_formats_with_nv12and added
NV12 case in existingskl_plane_formats
- Added the 10bpc RGB formatsv4: Addressed review comments from Clinton A Taylor "Why are we
adding
Quoted 24 lines
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 seriesv5: 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)Quoted 8 lines
v9: Rebased (me)
v10: Addressed review comments from Maarten.
Adding NV12 toskl_plane_formatsitself.v11: Addressed review comments from Shashank Sharma
v12: Addressed review comments from Shashank Sharma Made the
condition
Quoted 27 lines
in
intel_sprite_plane_createsimple 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_formatsto include NV12 and a checkskl_plane_has_planarin sprite create Added NV12 format toskl_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
Credits-to: Megha Aggarwal <[email protected]>
Credits-to: Kristian Høgsberg <[email protected]>Tested-by Clinton Taylor <[email protected]>Reviewed-by Juha-Pekka Heikkila <[email protected]>Reviewed-by Shashank Sharma <[email protected]>Reviewed-by Clinton Taylor <[email protected]>Signed-off-by Chandra Konduru <[email protected]>Signed-off-by Nabendu Maiti <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>Quoted 2 lines
--- drivers/gpu/drm/i915/intel_sprite.c | 29+++++++++++++++++++++++++++--
Review
Quoted 3 lines
1 file changed, 27 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_sprite.cdrivers/gpu/drm/i915/intel_sprite.c static bool skl_mod_supported(uint32_t
Quoted 24 lines
index aa1dfaa..8b7947d 100644
drivers/gpu/drm/i915/intel_sprite.c +13
-0@@ -1253,6 +1253,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 ,@@ -1350,6 +1363,12 @@ static bool skl_mod_supported(uint32_tformat,
uint64_tmodifier)drivers/gpu/drm/i915/intel_sprite.c static bool skl_mod_supported(uint32_t format, uint64_t modifier) · line 1371
Quoted 9 lines
drivers/gpu/drm/i915/intel_sprite.c +6
-0if (modifier == I915_FORMAT_MOD_Yf_TILED)return true;/* fall through */ +case DRM_FORMAT_NV12 : +if (modifier ==DRM_FORMAT_MOD_LINEAR || + modifier ==I915_FORMAT_MOD_X_TILED || + modifier ==I915_FORMAT_MOD_Y_TILED || + modifier == I915_FORMAT_MOD_Yf_TILED) +return true;Thanks for adding the modifier support.
Reviewed-by Kristian H. Kristensen <[email protected]>drivers/gpu/drm/i915/intel_sprite.c static bool skl_mod_supported(uint32_t format, uint64_t modifier)
Quoted 4 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-0case DRM_FORMAT_C8 : if (modifier == DRM_FORMAT_MOD_LINEAR || modifier == I915_FORMAT_MOD_X_TILED || @@ -1446,8 +1465,14 @@ intel_sprite_plane_create(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_sprite.c intel_sprite_plane_create(struct drm_i915_private *dev_priv,
Quoted 9 lines
intel_plane->disable_plane = skl_disable_plane; intel_plane->get_hw_state = skl_plane_get_hw_state;drivers/gpu/drm/i915/intel_sprite.c +4
-2- 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 =
Quoted 16 lines
ARRAY_SIZE(skl_planar_formats);drivers/gpu/drm/i915/intel_sprite.c intel_sprite_plane_create(struct drm_i915_private *dev_priv,
Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c +4
-0+ }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))
Quoted 8 lines
modifiers = skl_plane_format_modifiers_ccs;--
2.7.4_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 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
Credits-to: Maarten Lankhorst <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/i915/intel_display.c +16 -0
@@ -14261,6 +14261,14 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, goto err; }break ; +case DRM_FORMAT_NV12 : +if (INTEL_GEN (dev_priv) <9 ||IS_SKYLAKE (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));
@@ -14273,6 +14281,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
PATCH v2 5/6 drm/i915: Enable Display WA 0528
In reply to Vidya SrinivasPossible 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
Credits-to: Maarten Lankhorst <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +18 -2
@@ -505,6 +505,18 @@ 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)) +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))
@@ -5202,8 +5214,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,
@@ -5240,8 +5254,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 v2 6/6 drm/i915: Do not do fb src adjustments for NV12
In reply to Vidya SrinivasWe 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
Credits-to: Maarten Lankhorst <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 11 +++++++++++ drivers/gpu/drm/i915/intel_sprite.c | 15 +++++++++++++++ 2 files changed, 26 insertions(+)
drivers/gpu/drm/i915/intel_display.c +11 -0
@@ -12978,6 +12978,10 @@ intel_check_primary_plane(struct intel_plane *plane,bool can_position = false;int ret;uint32_t pixel_format =0 ; +struct drm_plane_state *plane_state = &state->base; +struct drm_rect *src = &plane_state->src; + + *src =drm_plane_state_src (plane_state);if (INTEL_GEN (dev_priv) >=9 ) {/* use scaler when colorkey is not required */
@@ -13001,6 +13005,13 @@ intel_check_primary_plane(struct intel_plane *plane,if (!state->base.fb)return 0 ; +if (pixel_format ==DRM_FORMAT_NV12 ) { + src->x1 = (((src->x1 >>16 )/4 )*4 ) <<16 ; + src->x2 = (((src->x2 >>16 )/4 )*4 ) <<16 ; + src->y1 = (((src->y1 >>16 )/4 )*4 ) <<16 ; + src->y2 = (((src->y2 >>16 )/4 )*4 ) <<16 ; + } +if (INTEL_GEN (dev_priv) >=9 ) { ret =skl_check_plane_surface (crtc_state, state);if (ret)
drivers/gpu/drm/i915/intel_sprite.c +15 -0
@@ -1035,11 +1035,20 @@ intel_check_sprite_plane(struct intel_plane *plane,return vscale; } +if (fb->format->format ==DRM_FORMAT_NV12 ) { +if (src->x2 >>16 ==16 ) + src->x2 =16 <<16 ; +if (src->y2 >>16 ==16 ) + src->y2 =16 <<16 ; + goto nv12_min_no_clip; + } +/* Make the source viewport size an exact multiple of the scaling factors. */ drm_rect_adjust_size (src,drm_rect_width (dst) * hscale -drm_rect_width (src),drm_rect_height (dst) * vscale -drm_rect_height (src)); +nv12_min_no_clip:drm_rect_rotate_inv (src, fb->width <<16 , fb->height <<16 , state->base.rotation);
@@ -1105,6 +1114,12 @@ intel_check_sprite_plane(struct intel_plane *plane, src->x2 = (src_x + src_w) <<16 ; src->y1 = src_y <<16 ; src->y2 = (src_y + src_h) <<16 ; +if (fb->format->format ==DRM_FORMAT_NV12 ) { + src->x1 = (((src->x1 >>16 )/4 )*4 ) <<16 ; + src->x2 = (((src->x2 >>16 )/4 )*4 ) <<16 ; + src->y1 = (((src->y1 >>16 )/4 )*4 ) <<16 ; + src->y2 = (((src->y2 >>16 )/4 )*4 ) <<16 ; + } } dst->x1 = crtc_x;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 6/6] drm/i915: Do not do fb src adjustments for NV12
Quoted 19 lines · Vidya Srinivas
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
Credits-to: Maarten Lankhorst <[email protected]>
Signed-off-by Vidya Srinivas <[email protected]>---
drivers/gpu/drm/i915/intel_display.c | 11 +++++++++++ drivers/gpu/drm/i915/intel_sprite.c | 15 +++++++++++++++2 files changed, 26 insertions(+)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c intel_check_primary_plane(struct intel_plane · line 12983
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +2
-0@@ -12978,6 +12978,10 @@ intel_check_primary_plane(struct intel_plane *plane, bool can_position = false; int ret; uint32_t pixel_format = 0; +struct drm_plane_state *plane_state = &state->base; +struct drm_rect *src = &plane_state->src;
This seems unnecessary. We could use the line below to get the src's.
Quoted 65 lines
drivers/gpu/drm/i915/intel_display.c +2
-0+ + *src =drm_plane_state_src (plane_state);
if (INTEL_GEN(dev_priv)>= 9) {
/* use scaler when colorkey is not required */drivers/gpu/drm/i915/intel_display.c +0
-0@@ -13001,6 +13005,13 @@ intel_check_primary_plane(struct intel_plane *plane, if (!state->base.fb) return 0;drivers/gpu/drm/i915/intel_display.c +7
-0+if (pixel_format ==DRM_FORMAT_NV12 ) { + src->x1 = (((src->x1 >>16 )/4 )*4 ) <<16 ; + src->x2 = (((src->x2 >>16 )/4 )*4 ) <<16 ; + src->y1 = (((src->y1 >>16 )/4 )*4 ) <<16 ; + src->y2 = (((src->y2 >>16 )/4 )*4 ) <<16 ; + } +if (
INTEL_GEN(dev_priv)>= 9) {
ret =skl_check_plane_surface(crtc_state, state); if (ret)drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -1035,11 +1035,20 @@ intel_check_sprite_plane(struct intel_plane *plane, return vscale; }drivers/gpu/drm/i915/intel_sprite.c +8
-0+if (fb->format->format ==DRM_FORMAT_NV12 ) { +if (src->x2 >>16 ==16 ) + src->x2 =16 <<16 ; +if (src->y2 >>16 ==16 ) + src->y2 =16 <<16 ; + goto nv12_min_no_clip; + } +/* Make the source viewport size an exact multiple of the scaling factors. */
drm_rect_adjust_size(src,drm_rect_width(dst)* hscale -drm_rect_width(src),
drm_rect_height(dst) * vscale -drm_rect_height(src));
+nv12_min_no_clip:
drm_rect_rotate_inv(src,fb->width<< 16,fb->height<< 16,
state->base.rotation);drivers/gpu/drm/i915/intel_sprite.c +6
-0@@ -1105,6 +1114,12 @@ intel_check_sprite_plane(struct intel_plane *plane, src->x2 = (src_x + src_w) << 16; src->y1 = src_y << 16; src->y2 = (src_y + src_h) << 16; +if (fb->format->format ==DRM_FORMAT_NV12 ) { + src->x1 = (((src->x1 >>16 )/4 )*4 ) <<16 ; + src->x2 = (((src->x2 >>16 )/4 )*4 ) <<16 ; + src->y1 = (((src->y1 >>16 )/4 )*4 ) <<16 ; + src->y2 = (((src->y2 >>16 )/4 )*4 ) <<16 ; + } }
dst->x1=crtc_x;
Signature · 6 lines
Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 6/6] drm/i915: Do not do fb src adjustments for NV12
Quoted 31 lines
-----Original Message-----
From: Kahola, Mika
Sent: Tuesday, April 17, 2018 2:49 PM
To: Srinivas, Vidya <[email protected]>; intel- [email protected]
Subject: Re: [Intel-gfx] [PATCH v2 6/6] drm/i915: Do not do fb src adjustments for NV12drivers/gpu/drm/i915/intel_display.c intel_check_primary_plane(struct
Quoted 19 lines · Vidya Srinivas
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
Credits-to: Maarten Lankhorst <[email protected]>
Signed-off-by Vidya Srinivas <[email protected]>---
drivers/gpu/drm/i915/intel_display.c | 11 +++++++++++ drivers/gpu/drm/i915/intel_sprite.c | 15 +++++++++++++++2 files changed, 26 insertions(+)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -12978,6 +12978,10 @@ intel_check_primary_plane(struct
intel_plane
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c intel_check_primary_plane(struct intel_plane *plane, · line 12982
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +2
-0*plane, bool can_position = false; int ret; uint32_t pixel_format = 0; +struct drm_plane_state *plane_state = &state->base; +struct drm_rect *src = &plane_state->src;This seems unnecessary. We could use the line below to get the src's.
Sure thank you, am moving all the handling code to skl_check_nv12_aux_surface as suggested By Maarten. So this wont be necessary.
Regards
Vidya
Quoted 64 lines
Quoted 29 lines
drivers/gpu/drm/i915/intel_display.c +2
-0+ + *src =drm_plane_state_src (plane_state); if (INTEL_GEN(dev_priv) >= 9) {/* use scaler when colorkey is not required */ @@ -13001,6 +13005,13 @@ intel_check_primary_plane(struct
intel_plane*plane, if (!state->base.fb)
return 0;drivers/gpu/drm/i915/intel_display.c +7
-0+if (pixel_format ==DRM_FORMAT_NV12 ) { + src->x1 = (((src->x1 >>16 )/4 )*4 ) <<16 ; + src->x2 = (((src->x2 >>16 )/4 )*4 ) <<16 ; + src->y1 = (((src->y1 >>16 )/4 )*4 ) <<16 ; + src->y2 = (((src->y2 >>16 )/4 )*4 ) <<16 ; + } +if (
INTEL_GEN(dev_priv)>= 9) {
ret =skl_check_plane_surface(crtc_state, state); if (ret)drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -1035,11 +1035,20 @@ intel_check_sprite_plane(struct intel_plane *plane, return vscale; }drivers/gpu/drm/i915/intel_sprite.c intel_check_sprite_plane(struct intel_plane · line 1047
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +8
-0+if (fb->format->format ==DRM_FORMAT_NV12 ) { +if (src->x2 >>16 ==16 ) + src->x2 =16 <<16 ; +if (src->y2 >>16 ==16 ) + src->y2 =16 <<16 ; + goto nv12_min_no_clip; + } + /* Make the source viewport size an exact multiple of thescaling
Quoted 3 lines
factors. */
drm_rect_adjust_size(src,drm_rect_width(dst)* hscale -
drm_rect_width(src),Quoted 1 line
drm_rect_height(dst) * vscale -
drm_rect_height(src));Quoted 18 lines
+nv12_min_no_clip:
drm_rect_rotate_inv(src, fb->width << 16, fb->height << 16, state->base.rotation);drivers/gpu/drm/i915/intel_sprite.c +6
-0@@ -1105,6 +1114,12 @@ intel_check_sprite_plane(struct intel_plane *plane, src->x2 = (src_x + src_w) << 16; src->y1 = src_y << 16; src->y2 = (src_y + src_h) << 16; +if (fb->format->format ==DRM_FORMAT_NV12 ) { + src->x1 = (((src->x1 >>16 )/4 )*4 ) <<16 ; + src->x2 = (((src->x2 >>16 )/4 )*4 ) <<16 ; + src->y1 = (((src->y1 >>16 )/4 )*4 ) <<16 ; + src->y2 = (((src->y2 >>16 )/4 )*4 ) <<16 ; + } }
Quoted 3 lines
Quoted 1 line
dst->x1=crtc_x;--
Mika Kahola - Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Enable NV12 support
In reply to Vidya Srinivas== Series Details ==
== Series Details ==
Series: Enable NV12 support
URL : https://patchwork.freedesktop.org/series/41674/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip d24b3eca473a drm/i915: Enable display workaround 827 for all planes, v2. -:58: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #58: FILE: drivers/gpu/drm/i915/intel_display.c:5148: + if ((INTEL_GEN(dev_priv) == 9 && !IS_GEMINILAKE(dev_priv)) || + IS_CANNONLAKE(dev_priv))
total: 0 errors, 0 warnings, 1 checks, 95 lines checked 40fa95f31fce drm/i915: Add NV12 as supported format for primary plane 8a5b4eaabb39 drm/i915: Add NV12 as supported format for sprite plane e82aedce2347 drm/i915: Add NV12 support to intel_framebuffer_init 124a184d1872 drm/i915: Enable Display WA 0528ff50c03cffbe drm/i915: Do not do fb src adjustments for NV12 -:35: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #35: FILE: drivers/gpu/drm/i915/intel_display.c:13009:
+ src->x1 = (((src->x1 >> 16)/4)*4) << 16;
^
-:35: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #35: FILE: drivers/gpu/drm/i915/intel_display.c:13009:
+ src->x1 = (((src->x1 >> 16)/4)*4) << 16;
^
-:36: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #36: FILE: drivers/gpu/drm/i915/intel_display.c:13010:
+ src->x2 = (((src->x2 >> 16)/4)*4) << 16;
^
-:36: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #36: FILE: drivers/gpu/drm/i915/intel_display.c:13010:
+ src->x2 = (((src->x2 >> 16)/4)*4) << 16;
^
-:37: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #37: FILE: drivers/gpu/drm/i915/intel_display.c:13011:
+ src->y1 = (((src->y1 >> 16)/4)*4) << 16;
^
-:37: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #37: FILE: drivers/gpu/drm/i915/intel_display.c:13011:
+ src->y1 = (((src->y1 >> 16)/4)*4) << 16;
^
-:38: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #38: FILE: drivers/gpu/drm/i915/intel_display.c:13012:
+ src->y2 = (((src->y2 >> 16)/4)*4) << 16;
^
-:38: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #38: FILE: drivers/gpu/drm/i915/intel_display.c:13012:
+ src->y2 = (((src->y2 >> 16)/4)*4) << 16;
^
-:74: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #74: FILE: drivers/gpu/drm/i915/intel_sprite.c:1118:
+ src->x1 = (((src->x1 >> 16)/4)*4) << 16;
^
-:74: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #74: FILE: drivers/gpu/drm/i915/intel_sprite.c:1118:
+ src->x1 = (((src->x1 >> 16)/4)*4) << 16;
^
-:75: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #75: FILE: drivers/gpu/drm/i915/intel_sprite.c:1119:
+ src->x2 = (((src->x2 >> 16)/4)*4) << 16;
^
-:75: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #75: FILE: drivers/gpu/drm/i915/intel_sprite.c:1119:
+ src->x2 = (((src->x2 >> 16)/4)*4) << 16;
^
-:76: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #76: FILE: drivers/gpu/drm/i915/intel_sprite.c:1120:
+ src->y1 = (((src->y1 >> 16)/4)*4) << 16;
^
-:76: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #76: FILE: drivers/gpu/drm/i915/intel_sprite.c:1120:
+ src->y1 = (((src->y1 >> 16)/4)*4) << 16;
^
-:77: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #77: FILE: drivers/gpu/drm/i915/intel_sprite.c:1121:
+ src->y2 = (((src->y2 >> 16)/4)*4) << 16;
^
-:77: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #77: FILE: drivers/gpu/drm/i915/intel_sprite.c:1121:
+ src->y2 = (((src->y2 >> 16)/4)*4) << 16;
^
total: 0 errors, 0 warnings, 16 checks, 55 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Enable NV12 support
In reply to Vidya Srinivas== Series Details ==
== Series Details ==
Series: Enable NV12 support
URL : https://patchwork.freedesktop.org/series/41674/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4052 -> Patchwork_8686 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/41674/revisions/1/mbox/
== Changes ==
No changes found
== Participating hosts (35 -> 32) ==
Additional (1): fi-cnl-y3
Missing (4): fi-ctg-p8600 fi-ilk-m540 fi-skl-6700hq fi-snb-2520m
== Build changes ==
* Linux: CI_DRM_4052 -> Patchwork_8686
CI_DRM_4052: ff6d5cf7b19871af5657774f4e8f5f91f6285e12 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4429: 80e4910581c7310258375a003a5de9a57ed24546 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8686: ff50c03cffbe8d8fbedbd51d5cab2b4ea6e0e2bb @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4429: 93b35926a150e318439d2505901288594b3548f5 @ git://anongit.freedesktop.org/piglit
== Linux commits ==
ff50c03cffbe drm/i915: Do not do fb src adjustments for NV12 124a184d1872 drm/i915: Enable Display WA 0528e82aedce2347 drm/i915: Add NV12 support to intel_framebuffer_init 8a5b4eaabb39 drm/i915: Add NV12 as supported format for sprite plane 40fa95f31fce drm/i915: Add NV12 as supported format for primary plane d24b3eca473a 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_8686/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
In reply to Vidya Srinivas== Series Details ==
== Series Details ==
Series: Enable NV12 support
URL : https://patchwork.freedesktop.org/series/41674/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4052_full -> Patchwork_8686_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_8686_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_8686_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/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_8686_full:
=== IGT changes ===
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-ctx-render:
shard-kbl: PASS -> SKIP
igt@gem_mocs_settings@mocs-rc6-render:
shard-kbl: SKIP -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-cpu:
shard-snb: SKIP -> PASS +2== Known issues ==
Here are the changes found in Patchwork_8686_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@2x-dpms-vs-vblank-race:
shard-hsw: PASS -> FAIL (fdo#103060)
igt@perf_pmu@rc6-runtime-pm-long:
shard-kbl: PASS -> FAIL (fdo#105010)
==== Possible fixes ====
igt@kms_flip@2x-plain-flip-fb-recreate:
shard-hsw: FAIL (fdo#100368) -> PASS +1
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-hsw: FAIL (fdo#105189) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#105010 https://bugs.freedesktop.org/show_bug.cgi?id=105010
fdo#105189 https://bugs.freedesktop.org/show_bug.cgi?id=105189
== Participating hosts (6 -> 4) ==
Missing (2): shard-glk shard-glkb
== Build changes ==
* Linux: CI_DRM_4052 -> Patchwork_8686
CI_DRM_4052: ff6d5cf7b19871af5657774f4e8f5f91f6285e12 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4429: 80e4910581c7310258375a003a5de9a57ed24546 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8686: ff50c03cffbe8d8fbedbd51d5cab2b4ea6e0e2bb @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4429: 93b35926a150e318439d2505901288594b3548f5 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8686/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx