Adding NV12 support
Subsystems (2)
cover Adding NV12 support
This patch series is adding NV12 support for Broxton display after rebasing on latest drm-tip.
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/
Review comments by Maarten are addressed in this series. NV12 enabled for Gen10.
Update from last rev:
Review comments from Shashank Sharma are addressed.
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 | 10 +- drivers/gpu/drm/i915/i915_reg.h | 7 + drivers/gpu/drm/i915/intel_atomic.c | 8 +- drivers/gpu/drm/i915/intel_display.c | 59 ++++- drivers/gpu/drm/i915/intel_drv.h | 9 +- drivers/gpu/drm/i915/intel_pm.c | 432 ++++++++++++++++++++++------------- drivers/gpu/drm/i915/intel_sprite.c | 18 +- 7 files changed, 356 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
@@ -1445,7 +1445,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; };
@@ -2141,7 +2141,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
@@ -480,7 +480,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
@@ -5044,8 +5044,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],
@@ -5097,7 +5097,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;
@@ -5199,8 +5199,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 )
@@ -5211,7 +5211,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); }
@@ -5343,7 +5343,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
v3: Rebased and addressed review comments by Maarten
--- drivers/gpu/drm/i915/i915_drv.h | 5 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 121 ++++++++++++++++++++------------------- 3 files changed, 66 insertions(+), 61 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -2
@@ -1441,8 +1441,9 @@ 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 ]; +/* packed/y */ +struct skl_ddb_entry plane[I915_MAX_PIPES ][I915_MAX_PLANES ]; +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
@@ -595,6 +595,7 @@ struct intel_pipe_wm {struct skl_plane_wm {struct skl_wm_level wm[8 ];struct skl_wm_level trans_wm; +bool is_planar; };struct skl_pipe_wm {
drivers/gpu/drm/i915/intel_pm.c +62 -59
275 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 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
@@ -2626,6 +2626,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@@ -2626,6 +2626,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
Re: [PATCH 03/16] drm/i915/skl+: add NV12 in skl_format_to_fourcc
Thank you. Will include the RB in the next series.
Regards
Vidya
Quoted 32 lines
-----Original Message-----
From: Kahola, Mika
Sent: Tuesday, February 13, 2018 4:05 PM
To: Srinivas, Vidya <[email protected]>; intel- [email protected]
Subject: Re: [Intel-gfx] [PATCH 03/16] drm/i915/skl+: add NV12 inskl_format_to_fourccQuoted 3 lines · Vidya Srinivas
From: Mahesh Kumar <[email protected]>
Add support of recognizing
DRM_FORMAT_NV12fromplane_formatregister
Quoted 2 lines
value.
Reviewed-by Mika Kahola <[email protected]>Quoted 14 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@@ -2626,6 +2626,8 @@ static int skl_format_to_fourcc(int format, bool rgb_order, bool alpha) switch (format) {case
PLANE_CTL_FORMAT_RGB_565:
Quoted 8 lines
Quoted 6 lines
return
DRM_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) {--
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]>
For YUV 420 Planar formats like NV12,
buffer allocation is done for Y and UV surfaces separately. For NV12 plane formats, the UV buffer
allocation must be programmed in the Plane Buffer Config register and the Y buffer allocation must be programmed in the Plane NV12 Buffer Config register. Both register values should be verified during verify_wm_state.
v2: Addressed review comments by Maarten.
v2: Addressed review comments by Shashank Sharma.
--- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 51 +++++++++++++++++++++++++++++------- 3 files changed, 43 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -2621,7 +2621,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
@@ -1595,6 +1595,7 @@ u32 skl_plane_stride(const struct drm_framebuffer *fb, int plane,int skl_check_plane_surface (const struct intel_crtc_state *crtc_state,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 +41 -10
63 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.
v2: Addressed review comments from Shashank Sharma.
--- 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, 44 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1461,6 +1461,7 @@ struct skl_wm_level {struct skl_wm_params {bool x_tiled, y_tiled;bool rc_surface; +bool is_planar;uint32_t width;uint8_t cpp;uint32_t plane_pixel_rate;
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -594,6 +594,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_planar; };
drivers/gpu/drm/i915/intel_pm.c +42 -12
126 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 patch passes skl_wm_level structure itself to watermark computation function skl_compute_plane_wm function (instead of its internal parameters). It reduces number of arguments required to be passed.
v2: Addressed review comments by Shashank Sharma
--- drivers/gpu/drm/i915/intel_pm.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +7 -11
@@ -4532,9 +4532,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];
@@ -4548,7 +4546,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 ; }
@@ -4629,7 +4627,7 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,if ((level >0 && res_lines >31 ) || res_blocks >= ddb_allocation || min_disp_buf_needed >= ddb_allocation) { - *enabled = false; + result->plane_en = false;/* * If there are no valid level 0 watermarks, then we can't
@@ -4649,9 +4647,9 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, }/* The number of lines are ignored for the level 0 watermark. */ - *out_lines = level ? res_lines :0 ; - *out_blocks = res_blocks; - *enabled = true; + result->plane_res_b = res_blocks; + result->plane_res_l = res_lines; + result->plane_en = true;return 0 ; }
@@ -4690,9 +4688,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 the current level. 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
@@ -4532,6 +4532,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;
@@ -4599,6 +4600,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 the current level. +* 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 (INTEL_GEN (dev_priv) >=11 ) {
@@ -4681,6 +4691,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,
@@ -4688,6 +4705,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
@@ -4656,6 +4656,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_planar && (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 ; + } +/* The number of lines are ignored for the level 0 watermark. */ result->plane_res_b = res_blocks; result->plane_res_l = res_lines;
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
@@ -5057,69 +5057,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;
@@ -5181,23 +5128,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
@@ -5208,14 +5155,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.
v11: Addressed review comments by Shashank Sharma. For Gen10+, the scaler mode to be set it planar or normal (single bit). Changed the code to be applicable to all Gen.
--- 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
@@ -6705,6 +6705,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_PLANAR (1 << 29)#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_PLANAR ; }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
@@ -2032,6 +2032,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 ;/*
@@ -979,7 +979,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)
v11: Addressed review comments from Shashank Sharma
--- drivers/gpu/drm/i915/intel_display.c | 40 ++++++++++++++++++++++++++---------- drivers/gpu/drm/i915/intel_drv.h | 3 ++- drivers/gpu/drm/i915/intel_sprite.c | 3 ++- 3 files changed, 33 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/intel_display.c +29 -11
@@ -3435,6 +3435,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); }
@@ -4658,7 +4660,9 @@ 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, +bool plane_scaler_check, +uint32_t pixel_format) {struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state;
@@ -4676,6 +4680,9 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,*/ need_scaling = src_w != dst_w || src_h != dst_h; +if (plane_scaler_check) + need_scaling = pixel_format ==DRM_FORMAT_NV12 ; +if (crtc_state->ycbcr420 && scaler_user ==SKL_CRTC_INDEX ) need_scaling = true;
@@ -4751,9 +4758,10 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state)const struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode;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); + &state->scaler_state.scaler_id, + state->pipe_src_w, state->pipe_src_h, + adjusted_mode->crtc_hdisplay, + adjusted_mode->crtc_vdisplay, false,0 ); }/**
@@ -4783,7 +4791,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), + true, fb->format->format);if (ret || plane_state->scaler_id <0 )return ret;
@@ -4809,6 +4818,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",
@@ -12758,11 +12768,13 @@ 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 ;
@@ -12784,8 +12796,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; }
@@ -12802,12 +12816,16 @@ intel_check_primary_plane(struct intel_plane *plane,bool can_position = false;struct drm_rect clip = {};int ret; +uint32_t pixel_format =0 ;if (INTEL_GEN (dev_priv) >=9 ) {/* use scaler when colorkey is not required */ if (!state->ckey.flags) { min_scale =1 ; - max_scale =skl_max_scale (to_intel_crtc (crtc), crtc_state); +if (state->base.fb) + pixel_format = state->base.fb->format->format; + max_scale =skl_max_scale (to_intel_crtc (crtc), + crtc_state, pixel_format); } can_position = true; }
drivers/gpu/drm/i915/intel_drv.h +2 -1
@@ -1580,7 +1580,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) { 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 | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_display.c +5 -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[] = {
@@ -13238,6 +13239,10 @@ 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 )) && + !IS_GEMINILAKE (dev_priv)) + 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.
v11: Addressed review comments from Shashank Sharma
--- drivers/gpu/drm/i915/intel_sprite.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_sprite.c +7 -0
@@ -1171,6 +1171,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[] = {
@@ -1369,6 +1370,12 @@ 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) ==9 && !IS_GEMINILAKE (dev_priv) && + (plane !=0 || pipe ==PIPE_C )) || + ((INTEL_GEN (dev_priv) ==10 || +IS_GEMINILAKE (dev_priv)) && plane !=0 )) + 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
v11: Addressed review comments from Shashank Sharma
--- drivers/gpu/drm/i915/intel_display.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_display.c +8 -0
@@ -14046,6 +14046,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
@@ -6426,6 +6426,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
@@ -3577,6 +3577,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: failure for Adding NV12 support (rev9)
In reply to Vidya Srinivas== Series Details ==
== Series Details ==
Series: Adding NV12 support (rev9)
URL : https://patchwork.freedesktop.org/series/28103/
State : failure
== Summary ==
Series 28103v9 Adding NV12 support
https://patchwork.freedesktop.org/api/1.0/series/28103/revisions/9/mbox/
Test debugfs_test:
Subgroup read_all_entries:
pass -> INCOMPLETE (fi-skl-6260u)
pass -> INCOMPLETE (fi-skl-6600u)
pass -> INCOMPLETE (fi-skl-6700hq)
pass -> INCOMPLETE (fi-skl-6700k2)
pass -> INCOMPLETE (fi-skl-6770hq)
pass -> INCOMPLETE (fi-skl-guc)
pass -> INCOMPLETE (fi-skl-gvtdvm)
pass -> INCOMPLETE (fi-bxt-dsi)
pass -> INCOMPLETE (fi-bxt-j4205)
pass -> INCOMPLETE (fi-kbl-7500u)
pass -> INCOMPLETE (fi-kbl-7560u)
pass -> INCOMPLETE (fi-kbl-r)
pass -> INCOMPLETE (fi-glk-1)
pass -> INCOMPLETE (fi-cfl-s2)
pass -> INCOMPLETE (fi-cnl-y3)
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
fail -> PASS (fi-gdg-551) fdo#102575fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fi-bdw-5557u total:288 pass:265 dwarn:0 dfail:0 fail:2 skip:21 time:440s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:426s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:379s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:499s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:290s fi-bxt-dsi total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-bxt-j4205 total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:475s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:464s fi-cfl-s2 total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-cnl-y3 total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:425s fi-gdg-551 total:288 pass:180 dwarn:0 dfail:0 fail:0 skip:108 time:284s fi-glk-1 total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-hsw-4770 total:288 pass:259 dwarn:0 dfail:0 fail:2 skip:27 time:412s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:413s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:449s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:417s fi-kbl-7500u total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-kbl-7560u total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-kbl-r total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:589s fi-skl-6260u total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-skl-6600u total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-skl-6700hq total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-skl-6700k2 total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-skl-6770hq total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-skl-guc total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-skl-gvtdvm total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:529s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:399s
Blacklisted hosts:
fi-glk-dsi total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0
013536408c7f1cd9049580cfc71865fcdeb86fa0 drm-tip: 2018y-02m-13d-07h-39m-27s UTC integration manifest 9ddb1b7bb8d0 drm/i915: Enable YUV to RGB for Gen10 in Plane Ctrl Regdebcd8661a6f drm/i915: Add NV12 support to intel_framebuffer_initaec85294fdf0 drm/i915: Add NV12 as supported format for sprite plane0b27b6661d93 drm/i915: Add NV12 as supported format for primary planed663c21e1e61 drm/i915: Upscale scaler max scale for NV12d5ab4be5be8d drm/i915: Update format_is_yuv() to include NV12b8309ae10590 drm/i915: Set scaler mode for NV12c0c0fc34cb86 drm/i915/skl: split skl_compute_ddb function3e841c628f8f drm/i915/skl+: nv12 workaround disable WM level 1-714d260795917 drm/i915/skl+: make sure higher latency level has higher wm value 6de0455767ce drm/i915/skl+: pass skl_wm_level struct to wm compute funcc6984cc3f781 drm/i915/skl+: NV12 related changes for WMd50a53d0520c drm/i915/skl+: support verification of DDB HW state for NV12 56fb963bf048 drm/i915/skl+: add NV12 in skl_format_to_fourcc2d1913bf696c drm/i915/skl+: refactor WM calculation for NV12635ac08d1f87 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_7992/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx