Adding NV12 support
Subsystems (2)
cover Adding NV12 support
This patch series is adding NV12 support for Gen >= 9 platforms. Current testing has been done on Gen9 and Gen10 only.
Initial series of the patches can be found here:
https://lists.freedesktop.org/archives/intel-gfx/2015-May/066786.html
Previous revision history:
The first version of patches were reviewed when floated by Chandra in 2015 but currently there was a design change with respect to
- the way fb offset is handled
- the way rotation is handled
Current NV12 patch series has been ported as per the
current changes on drm-tip
Review comments from Ville (12th June 2017) have been addressed Review comments from Clinton A Taylor (7th July 2017) have been addressed
Review comments from Clinton A Taylor (10th July 2017)
have been addressed. Had missed out tested-by/reviewed-by in the patches. Fixed that error in this series.
Review comments from Ville (11th July 2017) addressed.
Review comments from Paauwe, Bob (29th July 2017) addressed.
Update from rev 28 Aug 2017
Rebased the series.
Tested with IGT for rotation, sprite and tiling combinations. IGT Links:
https://patchwork.kernel.org/patch/9995943/
https://patchwork.kernel.org/patch/9995945/
Update from last rev (Jan 16th 2018):
Rebased the series.
Review comments by Maarten are addressed in this series. NV12 is enabled and tested on Gen10.
Patches are tested (dependent on) watermark necessary changes
https://patchwork.freedesktop.org/series/33439/
Chandra Konduru (6):
drm/i915: Set scaler mode for NV12
drm/i915: Update format_is_yuv() to include NV12 drm/i915: Upscale scaler max scale for NV12 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
Mahesh Kumar (9):
drm/i915/skl+: rename skl_wm_values struct to skl_ddb_values drm/i915/skl+: refactor WM calculation for NV12 drm/i915/skl+: add NV12 in skl_format_to_fourcc drm/i915/skl+: support verification of DDB HW state for NV12 drm/i915/skl+: NV12 related changes for WM drm/i915/skl+: pass skl_wm_level struct to wm compute func drm/i915/skl+: make sure higher latency level has higher wm value drm/i915/skl+: nv12 workaround disable WM level 1-7 drm/i915/skl: split skl_compute_ddb function
Vidya Srinivas (1):
drm/i915: Enable YUV to RGB for Gen10 in Plane Ctrl Reg
drivers/gpu/drm/i915/i915_drv.h | 9 +- drivers/gpu/drm/i915/i915_reg.h | 7 + drivers/gpu/drm/i915/intel_atomic.c | 8 +- drivers/gpu/drm/i915/intel_display.c | 51 ++++- drivers/gpu/drm/i915/intel_drv.h | 9 +- drivers/gpu/drm/i915/intel_pm.c | 433 ++++++++++++++++++++++------------- drivers/gpu/drm/i915/intel_sprite.c | 16 +- 7 files changed, 346 insertions(+), 187 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/16 drm/i915/skl+: rename skl_wm_values struct to skl_ddb_values
From: Mahesh Kumar <[email protected]>
skl_wm_values struct contains values of pipe/plane DDB only. so rename it for better readability of code. Similarly skl_copy_wm_for_pipe copies DDB values.
s/skl_wm_values/skl_ddb_values
s/skl_copy_wm_for_pipe/skl_copy_ddb_for_pipe
Changes since V1:
- also change name of skl_copy_wm_for_pipe
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_pm.c | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -1437,7 +1437,7 @@ struct skl_ddb_allocation {struct skl_ddb_entry y_plane[I915_MAX_PIPES ][I915_MAX_PLANES ]; }; -struct skl_wm_values { +struct skl_ddb_values {unsigned dirty_pipes;struct skl_ddb_allocation ddb; };
@@ -2131,7 +2131,7 @@ struct drm_i915_private {/* current hardware state */ union {struct ilk_wm_values hw; -struct skl_wm_values skl_hw; +struct skl_ddb_values skl_hw;struct vlv_wm_values vlv;struct g4x_wm_values g4x; };
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -476,7 +476,7 @@ struct intel_atomic_state {bool skip_intermediate_wm;/* Gen9+ only */ -struct skl_wm_values wm_results; +struct skl_ddb_values wm_results;struct i915_sw_fence commit_ready;
drivers/gpu/drm/i915/intel_pm.c +7 -7
@@ -4997,8 +4997,8 @@ skl_compute_ddb(struct drm_atomic_state *state) }static void -skl_copy_wm_for_pipe (struct skl_wm_values *dst, -struct skl_wm_values *src, +skl_copy_ddb_for_pipe (struct skl_ddb_values *dst, +struct skl_ddb_values *src,enum pipe pipe) { memcpy(dst->ddb.y_plane[pipe], src->ddb.y_plane[pipe],
@@ -5050,7 +5050,7 @@ skl_compute_wm(struct drm_atomic_state *state)struct drm_crtc *crtc;struct drm_crtc_state *cstate;struct intel_atomic_state *intel_state =to_intel_atomic_state (state); -struct skl_wm_values *results = &intel_state->wm_results; +struct skl_ddb_values *results = &intel_state->wm_results;struct drm_device *dev = state->dev;struct skl_pipe_wm *pipe_wm;bool changed = false;
@@ -5152,8 +5152,8 @@ static void skl_initial_wm(struct intel_atomic_state *state,struct intel_crtc *intel_crtc =to_intel_crtc (cstate->base.crtc);struct drm_device *dev = intel_crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct skl_wm_values *results = &state->wm_results; -struct skl_wm_values *hw_vals = &dev_priv->wm.skl_hw; +struct skl_ddb_values *results = &state->wm_results; +struct skl_ddb_values *hw_vals = &dev_priv->wm.skl_hw;enum pipe pipe = intel_crtc->pipe;if ((results->dirty_pipes &drm_crtc_mask (&intel_crtc->base)) ==0 )
@@ -5164,7 +5164,7 @@ static void skl_initial_wm(struct intel_atomic_state *state,if (cstate->base.active_changed)skl_atomic_update_crtc_wm (state, cstate); -skl_copy_wm_for_pipe (hw_vals, results, pipe); +skl_copy_ddb_for_pipe (hw_vals, results, pipe);mutex_unlock (&dev_priv->wm.wm_mutex); }
@@ -5296,7 +5296,7 @@ void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc,void skl_wm_get_hw_state (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct skl_wm_values *hw = &dev_priv->wm.skl_hw; +struct skl_ddb_values *hw = &dev_priv->wm.skl_hw;struct skl_ddb_allocation *ddb = &dev_priv->wm.skl_hw.ddb;struct drm_crtc *crtc;struct intel_crtc *intel_crtc;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/16 drm/i915/skl+: refactor WM calculation for NV12
In reply to Vidya SrinivasFrom: Mahesh Kumar <[email protected]>
Current code calculates DDB for planar formats in such a way that we store DDB of plane-0 in plane 1 & vice-versa.
In order to make this clean this patch refactors WM/DDB calculation for NV12 planar formats.
v2: Addressed review comments by Maarten
--- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 121 ++++++++++++++++++++------------------- 3 files changed, 64 insertions(+), 62 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -1433,8 +1433,8 @@ static inline bool skl_ddb_entry_equal(const struct skl_ddb_entry *e1, }struct skl_ddb_allocation { -struct skl_ddb_entry plane[I915_MAX_PIPES ][I915_MAX_PLANES ];/* packed/uv */ -struct skl_ddb_entry y_plane[I915_MAX_PIPES ][I915_MAX_PLANES ]; +struct skl_ddb_entry plane[I915_MAX_PIPES ][I915_MAX_PLANES ];/* packed/y */ +struct skl_ddb_entry uv_plane[I915_MAX_PIPES ][I915_MAX_PLANES ]; };struct skl_ddb_values {
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -592,6 +592,7 @@ struct intel_pipe_wm {struct skl_plane_wm {struct skl_wm_level wm[8 ];struct skl_wm_level trans_wm; +bool is_nv12; };struct skl_pipe_wm {
drivers/gpu/drm/i915/intel_pm.c +61 -60
274 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 02/16] drm/i915/skl+: refactor WM calculation for NV12
Op 22-01-18 om 13:03 schreef Vidya Srinivas:
Quoted 307 lines
From: Mahesh Kumar <[email protected]>
Current code calculates DDB for planar formats in such a way that we store DDB of plane-0 in plane 1 & vice-versa.
In order to make this clean this patch refactors WM/DDB calculation for NV12 planar formats.v2: Addressed review comments by Maarten
Reviewed-by Maarten Lankhorst <[email protected]>Signed-off-by Mahesh Kumar <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 121 ++++++++++++++++++++------------------- 3 files changed, 64 insertions(+), 62 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-2@@ -1433,8 +1433,8 @@ static inline bool skl_ddb_entry_equal(const struct skl_ddb_entry *e1, }struct skl_ddb_allocation { -struct skl_ddb_entry plane[I915_MAX_PIPES ][I915_MAX_PLANES ];/* packed/uv */ -struct skl_ddb_entry y_plane[I915_MAX_PIPES ][I915_MAX_PLANES ]; +struct skl_ddb_entry plane[I915_MAX_PIPES ][I915_MAX_PLANES ];/* packed/y */ +struct skl_ddb_entry uv_plane[I915_MAX_PIPES ][I915_MAX_PLANES ]; };struct skl_ddb_values {drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -592,6 +592,7 @@ struct intel_pipe_wm {struct skl_plane_wm {struct skl_wm_level wm[8 ];struct skl_wm_level trans_wm; +bool is_nv12; };struct skl_pipe_wm {drivers/gpu/drm/i915/intel_pm.c +46
-56@@ -4004,9 +4004,9 @@ int skl_check_pipe_max_pixel_rate(struct intel_crtc *intel_crtc,static unsigned int skl_plane_relative_data_rate (const struct intel_crtc_state *cstate,const struct drm_plane_state *pstate, -int y) +const int plane) { -struct intel_plane *plane =to_intel_plane (pstate->plane); +struct intel_plane *intel_plane =to_intel_plane (pstate->plane);struct intel_plane_state *intel_pstate =to_intel_plane_state (pstate);uint32_t data_rate;uint32_t width =0 , height =0 ;@@ -4020,9 +4020,9 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *cstate, fb = pstate->fb; format = fb->format->format; -if (plane->id ==PLANE_CURSOR ) +if (intel_plane->id ==PLANE_CURSOR )return 0 ; -if (y && format !=DRM_FORMAT_NV12 ) +if (plane ==1 && format !=DRM_FORMAT_NV12 )return 0 ;/* @@ -4033,19 +4033,14 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *cstate, width =drm_rect_width (&intel_pstate->base.src) >>16 ; height =drm_rect_height (&intel_pstate->base.src) >>16 ; -/* for planar format */ -if (format ==DRM_FORMAT_NV12 ) { -if (y)/* y-plane data rate */ - data_rate = width * height * - fb->format->cpp[0 ]; -else /* uv-plane data rate */ - data_rate = (width /2 ) * (height /2 ) * - fb->format->cpp[1 ]; - }else { -/* for packed formats */ - data_rate = width * height * fb->format->cpp[0 ]; +/* UV plane does 1/2 pixel sub-sampling */ +if (plane ==1 && format ==DRM_FORMAT_NV12 ) { + width /=2 ; + height /=2 ; } + data_rate = width * height * fb->format->cpp[plane]; + down_scale_amount =skl_plane_downscale_amount (cstate, intel_pstate);return mul_round_up_u32_fixed16 (data_rate, down_scale_amount);@@ -4058,8 +4053,8 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *cstate,*/ static unsigned int skl_get_total_relative_data_rate (struct intel_crtc_state *intel_cstate, -unsigned *plane_data_rate, -unsigned *plane_y_data_rate) +unsigned int *plane_data_rate, +unsigned int *uv_plane_data_rate) {struct drm_crtc_state *cstate = &intel_cstate->base;struct drm_atomic_state *state = cstate->state;@@ -4075,17 +4070,17 @@ skl_get_total_relative_data_rate(struct intel_crtc_state *intel_cstate,enum plane_id plane_id =to_intel_plane (plane)->id;unsigned int rate; -/* packed/uv */ +/* packed/y */ rate =skl_plane_relative_data_rate (intel_cstate, pstate,0 ); plane_data_rate[plane_id] = rate; total_data_rate += rate; -/* y-plane */ +/* uv-plane */ rate =skl_plane_relative_data_rate (intel_cstate, pstate,1 ); - plane_y_data_rate[plane_id] = rate; + uv_plane_data_rate[plane_id] = rate; total_data_rate += rate; }@@ -4094,8 +4089,7 @@ skl_get_total_relative_data_rate(struct intel_crtc_state *intel_cstate, }static uint16_t -skl_ddb_min_alloc (const struct drm_plane_state *pstate, -const int y) +skl_ddb_min_alloc (const struct drm_plane_state *pstate,const int plane) {struct drm_framebuffer *fb = pstate->fb;struct intel_plane_state *intel_pstate =to_intel_plane_state (pstate);@@ -4106,8 +4100,8 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate,if (WARN_ON (!fb))return 0 ; -/* For packed formats, no y-plane, return 0 */ -if (y && fb->format->format !=DRM_FORMAT_NV12 ) +/* For packed formats, and uv-plane, return 0 */ +if (plane ==1 && fb->format->format !=DRM_FORMAT_NV12 )return 0 ;/* For Non Y-tile return 8-blocks */ @@ -4126,15 +4120,12 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate, src_h =drm_rect_height (&intel_pstate->base.src) >>16 ;/* Halve UV plane width and height for NV12 */ -if (fb->format->format ==DRM_FORMAT_NV12 && !y) { +if (plane ==1 ) { src_w /=2 ; src_h /=2 ; } -if (fb->format->format ==DRM_FORMAT_NV12 && !y) - plane_bpp = fb->format->cpp[1 ]; -else - plane_bpp = fb->format->cpp[0 ]; + plane_bpp = fb->format->cpp[plane];if (drm_rotation_90_or_270 (pstate->rotation)) {switch (plane_bpp) {@@ -4162,7 +4153,7 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate,static void skl_ddb_calc_min (const struct intel_crtc_state *cstate,int num_active, -uint16_t *minimum,uint16_t *y_minimum) +uint16_t *minimum,uint16_t *uv_minimum) {const struct drm_plane_state *pstate;struct drm_plane *plane;@@ -4177,7 +4168,7 @@ skl_ddb_calc_min(const struct intel_crtc_state *cstate, int num_active,continue ; minimum[plane_id] =skl_ddb_min_alloc (pstate,0 ); - y_minimum[plane_id] =skl_ddb_min_alloc (pstate,1 ); + uv_minimum[plane_id] =skl_ddb_min_alloc (pstate,1 ); } minimum[PLANE_CURSOR ] =skl_cursor_allocation (num_active);@@ -4195,17 +4186,17 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,struct skl_ddb_entry *alloc = &cstate->wm.skl.ddb;uint16_t alloc_size, start;uint16_t minimum[I915_MAX_PLANES ] = {}; -uint16_t y_minimum[I915_MAX_PLANES ] = {}; +uint16_t uv_minimum[I915_MAX_PLANES ] = {};unsigned int total_data_rate;enum plane_id plane_id;int num_active; -unsigned plane_data_rate[I915_MAX_PLANES ] = {}; -unsigned plane_y_data_rate[I915_MAX_PLANES ] = {}; +unsigned int plane_data_rate[I915_MAX_PLANES ] = {}; +unsigned int uv_plane_data_rate[I915_MAX_PLANES ] = {};uint16_t total_min_blocks =0 ;/* Clear the partitioning for disabled planes. */ memset (ddb->plane[pipe],0 ,sizeof (ddb->plane[pipe])); -memset (ddb->y_plane[pipe],0 ,sizeof (ddb->y_plane[pipe])); +memset (ddb->uv_plane[pipe],0 ,sizeof (ddb->uv_plane[pipe]));if (WARN_ON (!state))return 0 ;@@ -4220,7 +4211,7 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,if (alloc_size ==0 )return 0 ; -skl_ddb_calc_min (cstate, num_active, minimum, y_minimum); +skl_ddb_calc_min (cstate, num_active, minimum, uv_minimum);/* * 1. Allocate the mininum required blocks for each active plane @@ -4230,7 +4221,7 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,for_each_plane_id_on_crtc (intel_crtc, plane_id) { total_min_blocks += minimum[plane_id]; - total_min_blocks += y_minimum[plane_id]; + total_min_blocks += uv_minimum[plane_id]; }if (total_min_blocks > alloc_size) {@@ -4252,14 +4243,14 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,*/ total_data_rate =skl_get_total_relative_data_rate (cstate, plane_data_rate, - plane_y_data_rate); + uv_plane_data_rate);if (total_data_rate ==0 )return 0 ; start = alloc->start;for_each_plane_id_on_crtc (intel_crtc, plane_id) { -unsigned int data_rate, y_data_rate; -uint16_t plane_blocks, y_plane_blocks =0 ; +unsigned int data_rate, uv_data_rate; +uint16_t plane_blocks, uv_plane_blocks;if (plane_id ==PLANE_CURSOR )continue ;@@ -4283,21 +4274,20 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, start += plane_blocks; -/* -* allocation for y_plane part of planar format: -*/ - y_data_rate = plane_y_data_rate[plane_id]; +/* Allocate DDB for UV plane for planar format/NV12 */ + uv_data_rate = uv_plane_data_rate[plane_id]; - y_plane_blocks = y_minimum[plane_id]; - y_plane_blocks +=div_u64 ((uint64_t )alloc_size * y_data_rate, + uv_plane_blocks = uv_minimum[plane_id]; + uv_plane_blocks +=div_u64 ((uint64_t )alloc_size * uv_data_rate, total_data_rate); -if (y_data_rate) { - ddb->y_plane[pipe][plane_id].start = start; - ddb->y_plane[pipe][plane_id].end = start + y_plane_blocks; +if (uv_data_rate) { + ddb->uv_plane[pipe][plane_id].start = start; + ddb->uv_plane[pipe][plane_id].end = start + + uv_plane_blocks; } - start += y_plane_blocks; + start += uv_plane_blocks; }return 0 ;@@ -4425,8 +4415,7 @@ skl_compute_plane_wm_params(const struct drm_i915_private *dev_priv, wp->width =drm_rect_width (&intel_pstate->base.src) >>16 ; } - wp->cpp = (fb->format->format ==DRM_FORMAT_NV12 ) ? fb->format->cpp[1 ] : - fb->format->cpp[0 ]; + wp->cpp = fb->format->cpp[0 ]; wp->plane_pixel_rate =skl_adjusted_plane_pixel_rate (cstate, intel_pstate);@@ -4618,6 +4607,9 @@ skl_compute_wm_levels(const struct drm_i915_private *dev_priv,return ret; } +if (intel_pstate->base.fb->format->format ==DRM_FORMAT_NV12 ) + wm->is_nv12 = true; +return 0 ; }@@ -4788,10 +4780,19 @@ static void skl_write_plane_wm(struct intel_crtc *intel_crtc,skl_write_wm_level (dev_priv,PLANE_WM_TRANS (pipe, plane_id), &wm->trans_wm); -skl_ddb_entry_write (dev_priv,PLANE_BUF_CFG (pipe, plane_id), - &ddb->plane[pipe][plane_id]); -skl_ddb_entry_write (dev_priv,PLANE_NV12_BUF_CFG (pipe, plane_id), - &ddb->y_plane[pipe][plane_id]); +if (wm->is_nv12) { + skl_ddb_entry_write(dev_priv, PLANE_BUF_CFG(pipe, plane_id),
drivers/gpu/drm/i915/intel_pm.c static void skl_write_plane_wm(struct intel_crtc *intel_crtc, · line 4794
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +10
-0+ &ddb->uv_plane[pipe][plane_id]); +skl_ddb_entry_write (dev_priv, +PLANE_NV12_BUF_CFG (pipe, plane_id), + &ddb->plane[pipe][plane_id]); + }else { +skl_ddb_entry_write (dev_priv,PLANE_BUF_CFG (pipe, plane_id), + &ddb->plane[pipe][plane_id]); +skl_ddb_entry_write (dev_priv, +PLANE_NV12_BUF_CFG (pipe, plane_id), + &ddb->uv_plane[pipe][plane_id]);
I915_WRITE(PLANE_NV12_BUF_CFG(pipe, plane_id), 0); for !NV12? much clearer..
Otherwise looks good so after we have tests it should be appliable with this fixed up by the committer.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/16 drm/i915/skl+: add NV12 in skl_format_to_fourcc
In reply to Vidya SrinivasFrom: Mahesh Kumar <[email protected]>
Add support of recognizing DRM_FORMAT_NV12 from plane_format register value.
--- drivers/gpu/drm/i915/intel_display.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_display.c +2 -0
@@ -2612,6 +2612,8 @@ static int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)switch (format) {case PLANE_CTL_FORMAT_RGB_565 :return DRM_FORMAT_RGB565 ; +case PLANE_CTL_FORMAT_NV12 : +return DRM_FORMAT_NV12 ;default :case PLANE_CTL_FORMAT_XRGB_8888 :if (rgb_order) {
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 03/16] drm/i915/skl+: add NV12 in skl_format_to_fourcc
Quoted 5 lines · Vidya Srinivas
From: Mahesh Kumar <[email protected]>
Add support of recognizing
DRM_FORMAT_NV12fromplane_formatregister value.
Quoted 20 lines
Signed-off-by Mahesh Kumar <[email protected]>---
drivers/gpu/drm/i915/intel_display.c | 2 ++1 file changed, 2 insertions(+)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -2612,6 +2612,8 @@ static int skl_format_to_fourcc(int format, bool rgb_order, bool alpha) switch (format) {case
PLANE_CTL_FORMAT_RGB_565:
returnDRM_FORMAT_RGB565;drivers/gpu/drm/i915/intel_display.c +2
-0+case PLANE_CTL_FORMAT_NV12 : +return DRM_FORMAT_NV12 ;default:
casePLANE_CTL_FORMAT_XRGB_8888:
if (rgb_order) {
Signature · 6 lines
Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/16 drm/i915/skl+: support verification of DDB HW state for NV12
In reply to Vidya SrinivasFrom: Mahesh Kumar <[email protected]>
NV12 formats have two registers for DDB. Verify both the registers for NV12 during verify_wm_state.
v2: Addressed review comments by Maarten.
--- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 50 ++++++++++++++++++++++++++++-------- 3 files changed, 42 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -2607,7 +2607,7 @@ static int i9xx_format_to_fourcc(int format) } } -static int skl_format_to_fourcc (int format,bool rgb_order,bool alpha) +int skl_format_to_fourcc (int format,bool rgb_order,bool alpha) {switch (format) {case PLANE_CTL_FORMAT_RGB_565 :
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1591,6 +1591,7 @@ u32 skl_plane_stride(const struct drm_framebuffer *fb, int plane, unsigned int rotation);int skl_check_plane_surface (struct intel_plane_state *plane_state);int i9xx_check_plane_surface (struct intel_plane_state *plane_state); +int skl_format_to_fourcc (int format,bool rgb_order,bool alpha);/* intel_csr.c */ void intel_csr_ucode_init (struct drm_i915_private *);
drivers/gpu/drm/i915/intel_pm.c +40 -10
62 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/16 drm/i915/skl+: NV12 related changes for WM
In reply to Vidya SrinivasFrom: Mahesh Kumar <[email protected]>
NV12 requires WM calculation for UV plane as well.
UV plane WM should also fulfill all the WM related restrictions.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 54 ++++++++++++++++++++++++++++++++-------- 3 files changed, 45 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1452,6 +1452,7 @@ struct skl_wm_level {struct skl_wm_params {bool x_tiled, y_tiled;bool rc_surface; +bool is_nv12;uint32_t width;uint8_t cpp;uint32_t plane_pixel_rate;
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -591,6 +591,7 @@ struct intel_pipe_wm {struct skl_plane_wm {struct skl_wm_level wm[8 ]; +struct skl_wm_level uv_wm[8 ];struct skl_wm_level trans_wm;bool is_nv12; };
drivers/gpu/drm/i915/intel_pm.c +43 -11
120 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/16 drm/i915/skl+: pass skl_wm_level struct to wm compute func
In reply to Vidya SrinivasFrom: Mahesh Kumar <[email protected]>
This will reduce number of arguments required to be passed in skl_compute_plane_wm function.
--- drivers/gpu/drm/i915/intel_pm.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +7 -11
@@ -4514,9 +4514,7 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,uint16_t ddb_allocation, int level, const struct skl_wm_params *wp, - uint16_t *out_blocks, /* out */ - uint8_t *out_lines, /* out */ - bool *enabled /* out */) + struct skl_wm_level *result /* out */) { const struct drm_plane_state *pstate = &intel_pstate->base;uint32_t latency = dev_priv->wm.skl_latency[level];
@@ -4529,7 +4527,7 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,if (latency ==0 || !intel_wm_plane_visible (cstate, intel_pstate)) { - *enabled = false; + result->plane_en = false;return 0 ; }
@@ -4584,7 +4582,7 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, }if (res_blocks >= ddb_allocation || res_lines >31 ) { - *enabled = false; + result->plane_en = false;/* * If there are no valid level 0 watermarks, then we can't
@@ -4603,9 +4601,9 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, } } - *out_blocks = res_blocks; - *out_lines = res_lines; - *enabled = true; + result->plane_res_b = res_blocks; + result->plane_res_l = res_lines; + result->plane_en = true;return 0 ; }
@@ -4646,9 +4644,7 @@ skl_compute_wm_levels(const struct drm_i915_private *dev_priv, ddb_blocks, level, wm_params, - &result->plane_res_b, - &result->plane_res_l, - &result->plane_en); + result);if (ret)return ret; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/16 drm/i915/skl+: make sure higher latency level has higher wm value
In reply to Vidya SrinivasFrom: Mahesh Kumar <[email protected]>
DDB allocation optimization algorithm requires/assumes ddb allocation for any memory C-state level DDB value to be as high as level below. Render decompression requires level WM to be as high as wm level-0. This patch fulfils both the requirements.
--- drivers/gpu/drm/i915/intel_pm.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +18 -0
@@ -4514,6 +4514,7 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,uint16_t ddb_allocation, int level, const struct skl_wm_params *wp, + const struct skl_wm_level *result_prev, struct skl_wm_level *result /* out */) { const struct drm_plane_state *pstate = &intel_pstate->base;
@@ -4579,6 +4580,15 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, }else { res_blocks++; } + +/* +* Make sure result blocks for higher latency levels are atleast +* as high as level below. +* Assumption in DDB algorithm optimization for special cases. +* Also covers Display WA #1125 for RC. +*/ +if (result_prev->plane_res_b > res_blocks) + res_blocks = result_prev->plane_res_b; }if (res_blocks >= ddb_allocation || res_lines >31 ) {
@@ -4637,6 +4647,13 @@ skl_compute_wm_levels(const struct drm_i915_private *dev_priv,for (level =0 ; level <= max_level; level++) {struct skl_wm_level *result = plane_num ? &wm->uv_wm[level] : &wm->wm[level]; +struct skl_wm_level *result_prev; + +if (level) + result_prev = plane_num ? &wm->uv_wm[level -1 ] : + &wm->wm[level -1 ]; +else + result_prev = plane_num ? &wm->uv_wm[0 ] : &wm->wm[0 ]; ret = skl_compute_plane_wm(dev_priv, cstate,
@@ -4644,6 +4661,7 @@ skl_compute_wm_levels(const struct drm_i915_private *dev_priv, ddb_blocks, level, wm_params, + result_prev, result);if (ret)return ret;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/16 drm/i915/skl+: nv12 workaround disable WM level 1-7
In reply to Vidya SrinivasFrom: Mahesh Kumar <[email protected]>
Display Workaround #0826 (SKL:ALL BXT:ALL) & #1059(CNL:A) Hardware sometimes fails to wake memory from pkg C states fetching the last few lines of planar YUV 420 (NV12) planes. This causes intermittent underflow and corruption.
WA: Disable package C states or do not enable latency levels 1 through 7 (WM1 - WM7) on NV12 planes.
v2: Addressed review comments by Maarten.
--- drivers/gpu/drm/i915/intel_pm.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +11 -0
@@ -4611,6 +4611,17 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, } } +/* +* Display WA #826 (SKL:ALL, BXT:ALL) & #1059 (CNL:A) +* disable wm level 1-7 on NV12 planes +*/ +if (wp->is_nv12 && (level >=1 ) && + (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv) || +IS_CNL_REVID (dev_priv,CNL_REVID_A0 ,CNL_REVID_A0 ))) { + result->plane_en = false; +return 0 ; + } + result->plane_res_b = res_blocks; result->plane_res_l = res_lines; result->plane_en = true;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/16 drm/i915/skl: split skl_compute_ddb function
In reply to Vidya SrinivasFrom: Mahesh Kumar <[email protected]>
This patch splits skl_compute_wm/ddb functions into two parts. One adds all affected pipes after the commit to atomic_state structure and second part does compute the DDB.
--- drivers/gpu/drm/i915/intel_pm.c | 157 ++++++++++++++++++++++------------------ 1 file changed, 88 insertions(+), 69 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +88 -69
@@ -5009,69 +5009,16 @@ skl_ddb_add_affected_planes(struct intel_crtc_state *cstate)static int skl_compute_ddb (struct drm_atomic_state *state) { -struct drm_device *dev = state->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +const struct drm_i915_private *dev_priv =to_i915 (state->dev);struct intel_atomic_state *intel_state =to_intel_atomic_state (state); -struct intel_crtc *intel_crtc;struct skl_ddb_allocation *ddb = &intel_state->wm_results.ddb; -uint32_t realloc_pipes =pipes_modified (state); -int ret; - -/* -* If this is our first atomic update following hardware readout, -* we can't trust the DDB that the BIOS programmed for us. Let's -* pretend that all pipes switched active status so that we'll -* ensure a full DDB recompute. -*/ -if (dev_priv->wm.distrust_bios_wm) { - ret =drm_modeset_lock (&dev->mode_config.connection_mutex, - state->acquire_ctx); -if (ret) -return ret; - - intel_state->active_pipe_changes = ~0 ; - -/* -* We usually only initialize intel_state->active_crtcs if we -* we're doing a modeset; make sure this field is always -* initialized during the sanitization process that happens -* on the first commit too. -*/ -if (!intel_state->modeset) - intel_state->active_crtcs = dev_priv->active_crtcs; - } - -/* -* If the modeset changes which CRTC's are active, we need to -* recompute the DDB allocation for *all* active pipes, even -* those that weren't otherwise being modified in any way by this -* atomic commit. Due to the shrinking of the per-pipe allocations -* when new active CRTC's are added, it's possible for a pipe that -* we were already using and aren't changing at all here to suddenly -* become invalid if its DDB needs exceeds its new allocation. -* -* Note that if we wind up doing a full DDB recompute, we can't let -* any other display updates race with this transaction, so we need -* to grab the lock on *all* CRTC's. -*/ -if (intel_state->active_pipe_changes) { - realloc_pipes = ~0 ; - intel_state->wm_results.dirty_pipes = ~0 ; - } +struct intel_crtc *crtc; +struct intel_crtc_state *cstate; +int ret, i; -/* -* We're not recomputing for the pipes not included in the commit, so -* make sure we start with the current state. -*/ memcpy (ddb, &dev_priv->wm.skl_hw.ddb,sizeof (*ddb)); -for_each_intel_crtc_mask (dev, intel_crtc, realloc_pipes) { -struct intel_crtc_state *cstate; - - cstate =intel_atomic_get_crtc_state (state, intel_crtc); -if (IS_ERR (cstate)) -return PTR_ERR (cstate); - +for_each_new_intel_crtc_in_state (intel_state, crtc, cstate, i) { ret =skl_allocate_pipe_ddb (cstate, ddb);if (ret)return ret;
@@ -5133,23 +5080,23 @@ skl_print_wm_changes(const struct drm_atomic_state *state) }static int -skl_compute_wm (struct drm_atomic_state *state) +skl_ddb_add_affected_pipes (struct drm_atomic_state *state,bool *changed) { -struct drm_crtc *crtc; -struct drm_crtc_state *cstate; -struct intel_atomic_state *intel_state =to_intel_atomic_state (state); -struct skl_ddb_values *results = &intel_state->wm_results;struct drm_device *dev = state->dev; -struct skl_pipe_wm *pipe_wm; -bool changed = false; +const struct drm_i915_private *dev_priv =to_i915 (dev); +const struct drm_crtc *crtc; +const struct drm_crtc_state *cstate; +struct intel_crtc *intel_crtc; +struct intel_atomic_state *intel_state =to_intel_atomic_state (state); +uint32_t realloc_pipes =pipes_modified (state);int ret, i;/* * When we distrust bios wm we always need to recompute to set the * expected DDB allocations for each CRTC. */ -if (to_i915 (dev)->wm.distrust_bios_wm) - changed = true; +if (dev_priv->wm.distrust_bios_wm) + *changed = true;/* * If this transaction isn't actually touching any CRTC's, don't
@@ -5160,14 +5107,86 @@ skl_compute_wm(struct drm_atomic_state *state)* hold _all_ CRTC state mutexes. */ for_each_new_crtc_in_state (state, crtc, cstate, i) - changed = true; + *changed = true; -if (!changed) +if (!*changed)return 0 ; +/* +* If this is our first atomic update following hardware readout, +* we can't trust the DDB that the BIOS programmed for us. Let's +* pretend that all pipes switched active status so that we'll +* ensure a full DDB recompute. +*/ +if (dev_priv->wm.distrust_bios_wm) { + ret =drm_modeset_lock (&dev->mode_config.connection_mutex, + state->acquire_ctx); +if (ret) +return ret; + + intel_state->active_pipe_changes = ~0 ; + +/* +* We usually only initialize intel_state->active_crtcs if we +* we're doing a modeset; make sure this field is always +* initialized during the sanitization process that happens +* on the first commit too. +*/ +if (!intel_state->modeset) + intel_state->active_crtcs = dev_priv->active_crtcs; + } + +/* +* If the modeset changes which CRTC's are active, we need to +* recompute the DDB allocation for *all* active pipes, even +* those that weren't otherwise being modified in any way by this +* atomic commit. Due to the shrinking of the per-pipe allocations +* when new active CRTC's are added, it's possible for a pipe that +* we were already using and aren't changing at all here to suddenly +* become invalid if its DDB needs exceeds its new allocation. +* +* Note that if we wind up doing a full DDB recompute, we can't let +* any other display updates race with this transaction, so we need +* to grab the lock on *all* CRTC's. +*/ +if (intel_state->active_pipe_changes) { + realloc_pipes = ~0 ; + intel_state->wm_results.dirty_pipes = ~0 ; + } + +/* +* We're not recomputing for the pipes not included in the commit, so +* make sure we start with the current state. +*/ +for_each_intel_crtc_mask (dev, intel_crtc, realloc_pipes) { +struct intel_crtc_state *cstate; + + cstate =intel_atomic_get_crtc_state (state, intel_crtc); +if (IS_ERR (cstate)) +return PTR_ERR (cstate); + } + +return 0 ; +} + +static int +skl_compute_wm (struct drm_atomic_state *state) +{ +struct drm_crtc *crtc; +struct drm_crtc_state *cstate; +struct intel_atomic_state *intel_state =to_intel_atomic_state (state); +struct skl_ddb_values *results = &intel_state->wm_results; +struct skl_pipe_wm *pipe_wm; +bool changed = false; +int ret, i; +/* Clear all dirty flags */ results->dirty_pipes =0 ; + ret =skl_ddb_add_affected_pipes (state, &changed); +if (ret || !changed) +return ret; + ret =skl_compute_ddb (state);if (ret)return ret;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/16 drm/i915: Set scaler mode for NV12
In reply to Vidya SrinivasFrom: Chandra Konduru <[email protected]>
This patch sets appropriate scaler mode for NV12 format. In this mode, skylake scaler does either chroma-upsampling or chroma-upsampling and resolution scaling
v2: Review comments from Ville addressed
NV12 case to be checked first for setting
the scaler
v3: Rebased (me)
v4: Rebased (me)
v5: Missed the Tested-by/Reviewed-by in the previous series Adding the same to commit message in this version.
v6: Rebased (me)
v7: Rebased (me)
v8: Rebased (me)
Restricting the NV12 change for scaler to BXT and KBL in this series.
v9: Rebased (me)
v10: As of now, NV12 has been tested on Gen9 and Gen10. However, code is applicable to all GEN >= 9. Hence making
that change to keep it generic.
Comments under v8 is not valid anymore.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_atomic.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -6663,6 +6663,7 @@ enum {#define PS_SCALER_MODE_MASK (3 << 28)#define PS_SCALER_MODE_DYN (0 << 28)#define PS_SCALER_MODE_HQ (1 << 28) +#define PS_SCALER_MODE_NV12 (2 << 28)#define PS_PLANE_SEL_MASK (7 << 25)#define PS_PLANE_SEL (plane) (((plane) + 1) << 25)#define PS_FILTER_MASK (3 << 23)
drivers/gpu/drm/i915/intel_atomic.c +6 -2
@@ -327,8 +327,12 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, }/* set scaler mode */ -if (IS_GEMINILAKE (dev_priv) ||IS_CANNONLAKE (dev_priv)) { - scaler_state->scalers[*scaler_id].mode =0 ; +if ((INTEL_GEN (dev_priv) >=9 ) && + plane_state && plane_state->base.fb && + plane_state->base.fb->format->format == +DRM_FORMAT_NV12 ) { + scaler_state->scalers[*scaler_id].mode = +PS_SCALER_MODE_NV12 ; }else if (num_scalers_need ==1 && intel_crtc->pipe !=PIPE_C ) {/* * when only 1 scaler is in use on either pipe A or B,
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/16 drm/i915: Update format_is_yuv() to include NV12
In reply to Vidya SrinivasFrom: Chandra Konduru <[email protected]>
This patch adds NV12 to format_is_yuv() function
for sprite planes.
v2:
-Use intel_ prefix for format_is_yuv (Ville)
v3: Rebased (me)
v4: Rebased and addressed review comments from Clinton A Taylor. "static function in intel_sprite.c is not available
to the primary plane functions".
Changed commit message - function modified for
sprite planes.
v5: Missed the Tested-by/Reviewed-by in the previous series Adding the same to commit message in this version.
v6: Rebased (me)
v7: Rebased (me)
v8: Rebased (me)
v9: Rebased (me)
v10: Changed intel_format_is_yuv function from static to non-static. We need to use it later from other files for check.
--- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_sprite.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -2029,6 +2029,7 @@ void skl_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc);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);/* intel_tv.c */ void intel_tv_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_sprite.c +4 -4
@@ -41,14 +41,14 @@#include <drm/i915_drm.h> #include "i915_drv.h" -static bool -format_is_yuv (uint32_t format) +bool intel_format_is_yuv (uint32_t format) {switch (format) {case DRM_FORMAT_YUYV :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY :case DRM_FORMAT_YVYU : +case DRM_FORMAT_NV12 :return true;default :return false;
@@ -352,7 +352,7 @@ chv_update_csc(struct intel_plane *plane, uint32_t format)enum plane_id plane_id = plane->id;/* Seems RGB data bypasses the CSC always */ -if (!format_is_yuv (format)) +if (!intel_format_is_yuv (format))return ;/*
@@ -975,7 +975,7 @@ intel_check_sprite_plane(struct intel_plane *plane, src_y = src->y1 >>16 ; src_h =drm_rect_height (src) >>16 ; -if (format_is_yuv (fb->format->format)) { +if (intel_format_is_yuv (fb->format->format)) { src_x &= ~1 ; src_w &= ~1 ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/16 drm/i915: Upscale scaler max scale for NV12
In reply to Vidya SrinivasFrom: Chandra Konduru <[email protected]>
This patch updates scaler max limit support for NV12
v2: Rebased (me)
v3: Rebased (me)
v4: Missed the Tested-by/Reviewed-by in the previous series Adding the same to commit message in this version.
v5: Addressed review comments from Ville and rebased
- calculation of max_scale to be made
less convoluted by splitting it up a bit
- Indentation errors to be fixed in the series
v6: Rebased (me)
Fixed review comments from Paauwe, Bob J
Previous version, where a split of calculation
was done, was wrong. Fixed that issue here.
v7: Rebased (me)
v8: Rebased (me)
v9: Rebased (me)
v10: Rebased (me)
--- drivers/gpu/drm/i915/intel_display.c | 33 +++++++++++++++++++++++---------- drivers/gpu/drm/i915/intel_drv.h | 3 ++- drivers/gpu/drm/i915/intel_sprite.c | 3 ++- 3 files changed, 27 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_display.c +23 -10
@@ -3397,6 +3397,8 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)return PLANE_CTL_FORMAT_YUV422 |PLANE_CTL_YUV422_UYVY ;case DRM_FORMAT_VYUY :return PLANE_CTL_FORMAT_YUV422 |PLANE_CTL_YUV422_VYUY ; +case DRM_FORMAT_NV12 : +return PLANE_CTL_FORMAT_NV12 ;default :MISSING_CASE (pixel_format); }
@@ -4620,7 +4622,8 @@ static void cpt_verify_modeset(struct drm_device *dev, int pipe)static int skl_update_scaler (struct intel_crtc_state *crtc_state,bool force_detach,unsigned int scaler_user,int *scaler_id, -int src_w,int src_h,int dst_w,int dst_h) +int src_w,int src_h,int dst_w,int dst_h, +uint32_t pixel_format) {struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state;
@@ -4636,7 +4639,8 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,* the 90/270 degree plane rotation cases (to match the * GTT mapping), hence no need to account for rotation here. */ - need_scaling = src_w != dst_w || src_h != dst_h; + need_scaling = src_w != dst_w || src_h != dst_h || + (pixel_format ==DRM_FORMAT_NV12 );if (crtc_state->ycbcr420 && scaler_user ==SKL_CRTC_INDEX ) need_scaling = true;
@@ -4715,7 +4719,7 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state)return skl_update_scaler (state, !state->base.active,SKL_CRTC_INDEX , &state->scaler_state.scaler_id, state->pipe_src_w, state->pipe_src_h, - adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay); + adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay,0 ); }/**
@@ -4745,7 +4749,8 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,drm_rect_width (&plane_state->base.src) >>16 ,drm_rect_height (&plane_state->base.src) >>16 ,drm_rect_width (&plane_state->base.dst), - drm_rect_height(&plane_state->base.dst)); +drm_rect_height (&plane_state->base.dst), + fb ? fb->format->format : 0);if (ret || plane_state->scaler_id <0 )return ret;
@@ -4771,6 +4776,7 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV12 :break ;default : DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",
@@ -12701,11 +12707,12 @@ intel_cleanup_plane_fb(struct drm_plane *plane, }int -skl_max_scale (struct intel_crtc *intel_crtc,struct intel_crtc_state *crtc_state) +skl_max_scale (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state,uint32_t pixel_format) {struct drm_i915_private *dev_priv; -int max_scale; -int crtc_clock, max_dotclk; +int max_scale, mult; +int crtc_clock, max_dotclk, tmpclk1, tmpclk2;if (!intel_crtc || !crtc_state->base.enable)return DRM_PLANE_HELPER_NO_SCALING ;
@@ -12727,8 +12734,10 @@ skl_max_scale(struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state* or * cdclk/crtc_clock */ - max_scale =min ((1 <<16 ) *3 -1 , - (1 <<8 ) * ((max_dotclk <<8 ) / crtc_clock)); + mult = pixel_format ==DRM_FORMAT_NV12 ?2 :3 ; + tmpclk1 = (1 <<16 ) * mult -1 ; + tmpclk2 = (1 <<8 ) * ((max_dotclk <<8 ) / crtc_clock); + max_scale =min (tmpclk1, tmpclk2);return max_scale; }
@@ -12749,7 +12758,11 @@ intel_check_primary_plane(struct intel_plane *plane,/* use scaler when colorkey is not required */ if (state->ckey.flags ==I915_SET_COLORKEY_NONE ) { min_scale =1 ; - max_scale =skl_max_scale (to_intel_crtc (crtc), crtc_state); + max_scale =skl_max_scale (to_intel_crtc (crtc), + crtc_state, + state->base.fb ? + state->base.fb->format->format : +0 ); } can_position = true; }
drivers/gpu/drm/i915/intel_drv.h +2 -1
@@ -1577,7 +1577,8 @@ void intel_mode_from_pipe_config(struct drm_display_mode *mode, struct intel_crtc_state *pipe_config);int skl_update_scaler_crtc (struct intel_crtc_state *crtc_state); -int skl_max_scale (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state); +int skl_max_scale (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state, +uint32_t pixel_format);static inline u32 intel_plane_ggtt_offset (const struct intel_plane_state *state) {
drivers/gpu/drm/i915/intel_sprite.c +2 -1
@@ -897,7 +897,8 @@ intel_check_sprite_plane(struct intel_plane *plane,if (state->ckey.flags ==I915_SET_COLORKEY_NONE ) { can_scale =1 ; min_scale =1 ; - max_scale =skl_max_scale (crtc, crtc_state); + max_scale =skl_max_scale (crtc, crtc_state, + fb->format->format); }else { can_scale =0 ; min_scale =DRM_PLANE_HELPER_NO_SCALING ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 13/16 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.
--- drivers/gpu/drm/i915/intel_display.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_display.c +4 -0
@@ -86,6 +86,7 @@ static const uint32_t skl_primary_formats[] = {DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , + DRM_FORMAT_NV12, }; static const uint64_t skl_format_modifiers_noccs[] = {
@@ -13171,6 +13172,9 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) intel_primary_formats = skl_primary_formats; num_formats =ARRAY_SIZE (skl_primary_formats); +if (INTEL_GEN (dev_priv) ==9 && (pipe ==PIPE_C )) + num_formats -=1 ; +if (skl_plane_has_ccs (dev_priv, pipe,PLANE_PRIMARY )) modifiers = skl_format_modifiers_ccs;else
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 14/16 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.
--- drivers/gpu/drm/i915/intel_sprite.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_sprite.c +5 -0
@@ -1161,6 +1161,7 @@ static uint32_t skl_plane_formats[] = {DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , + DRM_FORMAT_NV12, }; static const uint64_t skl_plane_format_modifiers_noccs[] = {
@@ -1359,6 +1360,10 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, plane_formats = skl_plane_formats; num_plane_formats =ARRAY_SIZE (skl_plane_formats); +if (INTEL_GEN (dev_priv) <=10 && ((plane !=0 ) || + (pipe ==PIPE_C ))) + num_plane_formats -=1 ; +if (skl_plane_has_ccs (dev_priv, pipe,PLANE_SPRITE0 + plane)) modifiers = skl_plane_format_modifiers_ccs;else
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 15/16 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
--- drivers/gpu/drm/i915/intel_display.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_display.c +8 -0
@@ -13976,6 +13976,14 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, goto err; }break ; +case DRM_FORMAT_NV12 : +if (INTEL_GEN (dev_priv) <9 ) { +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));
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 16/16 drm/i915: Enable YUV to RGB for Gen10 in Plane Ctrl Reg
In reply to Vidya SrinivasIf the fb format is YUV, enable the plane CSC mode bits for the conversion.
--- drivers/gpu/drm/i915/i915_reg.h | 6 ++++++ drivers/gpu/drm/i915/intel_display.c | 2 ++ 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +6 -0
@@ -6384,6 +6384,12 @@ enum {#define _PLANE_COLOR_CTL_3_A 0x703CC/* GLK+ */ #define PLANE_COLOR_PIPE_GAMMA_ENABLE (1 << 30)#define PLANE_COLOR_PIPE_CSC_ENABLE (1 << 23) +#define PLANE_COLOR_CSC_MASK (0x7 << 17) +#define PLANE_COLOR_CSC_MODE_BYPASS (0 << 17) +#define PLANE_COLOR_CSC_MODE_YUV601_TO_RGB709 (1 << 17) +#define PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709 (2 << 17) +#define PLANE_COLOR_CSC_MODE_YUV2020_TO_RGB2020 (3 << 17) +#define PLANE_COLOR_CSC_MODE_RGB709_TO_RGB2020 (4 << 17)#define PLANE_COLOR_PLANE_GAMMA_DISABLE (1 << 13)#define PLANE_COLOR_ALPHA_MASK (0x3 << 4)#define PLANE_COLOR_ALPHA_DISABLE (0 << 4)
drivers/gpu/drm/i915/intel_display.c +2 -0
@@ -3539,6 +3539,8 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state, plane_color_ctl |=PLANE_COLOR_PIPE_CSC_ENABLE ; plane_color_ctl |=PLANE_COLOR_PLANE_GAMMA_DISABLE ; plane_color_ctl |=glk_plane_color_ctl_alpha (fb->format->format); +if (intel_format_is_yuv (fb->format->format)) + plane_color_ctl |=PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709 ;return plane_color_ctl; }
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 Adding NV12 support (rev7)
In reply to Vidya Srinivas== Series Details ==
== Series Details ==
Series: Adding NV12 support (rev7)
URL : https://patchwork.freedesktop.org/series/28103/
State : success
== Summary ==
Series 28103v7 Adding NV12 support
https://patchwork.freedesktop.org/api/1.0/series/28103/revisions/7/mbox/
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:427s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:432s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:383s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:521s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:292s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:501s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:497s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:494s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:479s fi-elk-e7500 total:224 pass:168 dwarn:9 dfail:1 fail:0 skip:45 fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:307s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:531s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:394s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:404s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:420s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:469s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:419s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:468s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:501s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:464s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:510s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:634s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:436s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:519s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:534s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:495s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:496s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:427s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:442s fi-snb-2520m total:245 pass:211 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:409s Blacklisted hosts: fi-cfl-s2 total:288 pass:256 dwarn:0 dfail:0 fail:3 skip:26 time:564s fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:485s
be38e25290c9e7d4fe196977d71ea4aba7d92dd1 drm-tip: 2018y-01m-22d-11h-16m-45s UTC integration manifest eb196c11b901 drm/i915: Enable YUV to RGB for Gen10 in Plane Ctrl Reg0c7152ea9eea drm/i915: Add NV12 support to intel_framebuffer_init9d2ea1c202e1 drm/i915: Add NV12 as supported format for sprite plane514cf2654ce7 drm/i915: Add NV12 as supported format for primary plane9d6475430376 drm/i915: Upscale scaler max scale for NV12de495f7786ef drm/i915: Update format_is_yuv() to include NV126ad39e4b8620 drm/i915: Set scaler mode for NV126c62dead084e drm/i915/skl: split skl_compute_ddb functionb7024c4da6d9 drm/i915/skl+: nv12 workaround disable WM level 1-797ae3e76f79b drm/i915/skl+: make sure higher latency level has higher wm value 61331a2db19b drm/i915/skl+: pass skl_wm_level struct to wm compute func56148e08cf02 drm/i915/skl+: NV12 related changes for WM3baebdbb122f drm/i915/skl+: support verification of DDB HW state for NV12 bb3fd7868e54 drm/i915/skl+: add NV12 in skl_format_to_fourcc6a0ed4afec26 drm/i915/skl+: refactor WM calculation for NV12009a14962919 drm/i915/skl+: rename skl_wm_values struct to skl_ddb_values
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7737/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for Adding NV12 support (rev7)
In reply to Vidya Srinivas== Series Details ==
== Series Details ==
Series: Adding NV12 support (rev7)
URL : https://patchwork.freedesktop.org/series/28103/
State : warning
== Summary ==
Test kms_flip:
Subgroup 2x-flip-vs-dpms-off-vs-modeset:
pass -> DMESG-WARN (shard-hsw)
Subgroup 2x-vblank-vs-modeset-suspend-interruptible:
incomplete -> PASS (shard-hsw)
Test kms_plane_lowres:
Subgroup pipe-c-tiling-x:
pass -> FAIL (shard-apl) fdo#103166
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> SKIP (shard-hsw) fdo#103375
Test kms_frontbuffer_tracking:
Subgroup fbc-rgb565-draw-blt:
pass -> FAIL (shard-snb) fdo#101623
Test kms_sysfs_edid_timing:
warn -> PASS (shard-apl) fdo#100047
Test kms_cursor_legacy:
Subgroup flip-vs-cursor-legacy:
pass -> FAIL (shard-apl) fdo#102670
Test pm_rc6_residency:
Subgroup rc6-accuracy:
pass -> SKIP (shard-snb)
Test kms_atomic_transition:
Subgroup 1x-modeset-transitions:
fail -> PASS (shard-apl) fdo#103207
Test perf:
Subgroup buffer-fill:
fail -> PASS (shard-apl) fdo#103755
Subgroup polling:
pass -> FAIL (shard-hsw) fdo#102252fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
fdo#103207 https://bugs.freedesktop.org/show_bug.cgi?id=103207
fdo#103755 https://bugs.freedesktop.org/show_bug.cgi?id=103755
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-apl total:2780 pass:1714 dwarn:1 dfail:0 fail:25 skip:1040 time:14689s shard-hsw total:2780 pass:1721 dwarn:2 dfail:0 fail:13 skip:1043 time:15527s shard-snb total:2780 pass:1315 dwarn:1 dfail:0 fail:14 skip:1450 time:8094s
Blacklisted hosts:
shard-kbl total:2780 pass:1837 dwarn:1 dfail:0 fail:24 skip:918 time:11085s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7737/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx