[Intel-gfx] [PATCH 1/3] Revert "drm/i915: W/A for underruns with WM1+ disabled on icl"

[Clinton Taylor]

Reviewed-by: Clint Taylor <Clinton.A.Taylor at intel.com>

-Clint


On 2/13/19 8:54 AM, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> This reverts commit bf002c100740f4ae01d0d86b44f65a712ee14031.
>
> The hw team has come up with a better workaround. So
> let's get rid of this one.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>   drivers/gpu/drm/i915/i915_reg.h      | 1 -
>   drivers/gpu/drm/i915/intel_display.c | 6 ------
>   2 files changed, 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 0df8c6e76da7..f3f0b53c9e0e 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -7653,7 +7653,6 @@ enum {
>   #define _PIPEB_CHICKEN			0x71038
>   #define _PIPEC_CHICKEN			0x72038
>   #define  PER_PIXEL_ALPHA_BYPASS_EN	(1 << 7)
> -#define  PM_FILL_MAINTAIN_DBUF_FULLNESS	(1 << 0)
>   #define PIPE_CHICKEN(pipe)		_MMIO_PIPE(pipe, _PIPEA_CHICKEN,\
>   						   _PIPEB_CHICKEN)
>   
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 0a8913b2059e..73a107b6eb9a 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3971,12 +3971,6 @@ static void icl_set_pipe_chicken(struct intel_crtc *crtc)
>   	 */
>   	tmp |= PER_PIXEL_ALPHA_BYPASS_EN;
>   
> -	/*
> -	 * W/A for underruns with linear/X-tiled with
> -	 * WM1+ disabled.
> -	 */
> -	tmp |= PM_FILL_MAINTAIN_DBUF_FULLNESS;
> -
>   	I915_WRITE(PIPE_CHICKEN(pipe), tmp);
>   }
>