[Intel-gfx] [PATCH] drm/i915/display: Fixed kernel taint in audio codec init

[Shankar, Uma]

> -----Original Message-----
> From: Shankar, Uma <uma.shankar at intel.com>
> Sent: Monday, April 20, 2020 7:04 PM
> To: intel-gfx at lists.freedesktop.org
> Cc: Vehmanen, Kai <kai.vehmanen at intel.com>; Gupta, Anshuman
> <anshuman.gupta at intel.com>; jani.nikula at linux.intel.com; chris-wilson.co.uk;
> Shankar, Uma <uma.shankar at intel.com>
> Subject: [PATCH] drm/i915/display: Fixed kernel taint in audio codec init
> 
> This patch fixes a kernel taint on non DSC DP monitors.
> 
> Fixes: 48b8b04c7 ("drm/i915/display: Enable DP Display Audio WA")
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/1750
> Signed-off-by: Uma Shankar <uma.shankar at intel.com>

We will abandon this and go with below patch
https://patchwork.freedesktop.org/series/76196/

Please ignore this patch for review.

>  drivers/gpu/drm/i915/display/intel_audio.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_audio.c
> b/drivers/gpu/drm/i915/display/intel_audio.c
> index 2663e71059af..0ff7c3f07fa5 100644
> --- a/drivers/gpu/drm/i915/display/intel_audio.c
> +++ b/drivers/gpu/drm/i915/display/intel_audio.c
> @@ -606,7 +606,7 @@ static void enable_audio_dsc_wa(struct intel_encoder
> *encoder,
>  	h_active = crtc_state->hw.adjusted_mode.hdisplay;
> 
>  	if (!(h_active && crtc_state->port_clock && crtc_state->lane_count &&
> -	      crtc_state->dsc.compressed_bpp && i915->cdclk.hw.cdclk)) {
> +	      i915->cdclk.hw.cdclk)) {
>  		drm_err(&i915->drm, "Null Params rcvd for hblank early
> enabling\n");
>  		WARN_ON(1);
>  		return;
> @@ -620,8 +620,9 @@ static void enable_audio_dsc_wa(struct intel_encoder
> *encoder,
>  		val |= HBLANK_EARLY_ENABLE_TGL(pipe);
> 
>  	if (crtc_state->dsc.compression_enable &&
> +	    crtc_state->dsc.compressed_bpp &&
>  	    (crtc_state->hw.adjusted_mode.hdisplay >= 3840 &&
> -	    crtc_state->hw.adjusted_mode.vdisplay >= 2160)) {
> +	     crtc_state->hw.adjusted_mode.vdisplay >= 2160)) {
>  		/* Get hblank early enable value required */
>  		hblank_early_prog = get_hblank_early_enable_config(encoder,
>  								   crtc_state);
> --
> 2.22.0