[PATCH v1 6/6] drm/i915: Enable Display WA 0528
Maarten Lankhorst
maarten.lankhorst at linux.intel.com
Wed Apr 11 14:15:33 UTC 2018
Op 11-04-18 om 11:43 schreef Vidya Srinivas:
> Possible hang with NV12 plane surface formats.
> WA: When the plane source pixel format is NV12,
> the CHICKEN_PIPESL_* register bit 22 must be set to 1
> and the render decompression must not be enabled
> on any of the planes in that pipe.
>
> Signed-off-by: Vidya Srinivas <vidya.srinivas at intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 24 ++++++++++++++++++++++--
> 1 file changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index e4cf7a6..58377ad 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -505,6 +505,20 @@ static const struct intel_limit intel_limits_bxt = {
> };
>
> static void
> +skl_wa_528(struct drm_i915_private *dev_priv, int pipe, bool enable)
> +{
> + if (IS_SKYLAKE(dev_priv))
> + return;
> +
> + if (enable)
> + I915_WRITE(CHICKEN_PIPESL_1(pipe), HSW_FBCQ_DIS);
> + else
> + I915_WRITE(CHICKEN_PIPESL_1(pipe), ~HSW_FBCQ_DIS);
> +
> + POSTING_READ(CHICKEN_PIPESL_1(pipe));
> +}
The posting_reads don't add anything, please remove. :)
> +static void
> skl_wa_clkgate(struct drm_i915_private *dev_priv, int pipe, bool enable)
> {
> if (IS_SKYLAKE(dev_priv))
> @@ -517,6 +531,8 @@ skl_wa_clkgate(struct drm_i915_private *dev_priv, int pipe, bool enable)
> I915_WRITE(CLKGATE_DIS_PSL(pipe),
> I915_READ(CLKGATE_DIS_PSL(pipe)) &
> ~(DUPS1_GATING_DIS | DUPS2_GATING_DIS));
> +
> + POSTING_READ(CLKGATE_DIS_PSL(pipe));
> }
>
> static bool
> @@ -5202,8 +5218,10 @@ static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)
>
> /* Display WA 827 */
> if (needs_nv12_wa(dev_priv, old_crtc_state) &&
> - !needs_nv12_wa(dev_priv, pipe_config))
> + !needs_nv12_wa(dev_priv, pipe_config)) {
> skl_wa_clkgate(dev_priv, crtc->pipe, false);
> + skl_wa_528(dev_priv, crtc->pipe, false);
> + }
> }
>
> static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,
> @@ -5240,8 +5258,10 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,
>
> /* Display WA 827 */
> if (!needs_nv12_wa(dev_priv, old_crtc_state) &&
> - needs_nv12_wa(dev_priv, pipe_config))
> + needs_nv12_wa(dev_priv, pipe_config)) {
> skl_wa_clkgate(dev_priv, crtc->pipe, true);
> + skl_wa_528(dev_priv, crtc->pipe, true);
> + }
>
> /*
> * Vblank time updates from the shadow to live plane control register
More information about the Intel-gfx-trybot
mailing list