[Intel-gfx] [PATCH] drm/i915: Fix wrong condition in bxt_set_cdclk for DG2

[Andrzej Hajda]

On 06.05.2023 16:42, Stanislav Lisovskiy wrote:
> By my own mistake, after adding !IS_DG2 into wrong branch,
> bxt_set_cdclk started to execute code intended for platforms
> gen < 11, which is wrong.
> Move IS_DG2 check to better place.
> 
> Fixes: ceb0cc3b4288 ("drm/i915: Communicate display power demands to pcode")
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy at intel.com>

Reviewed-by: Andrzej Hajda <andrzej.hajda at intel.com>

Regards
Andrzej

> ---
>   drivers/gpu/drm/i915/display/intel_cdclk.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index a11092deaba6..6bed75f1541a 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -1896,9 +1896,9 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
>   	 * mailbox communication, skip
>   	 * this step.
>   	 */
> -	if (DISPLAY_VER(dev_priv) >= 14)
> +	if (DISPLAY_VER(dev_priv) >= 14 || IS_DG2(dev_priv))
>   		/* NOOP */;
> -	else if (DISPLAY_VER(dev_priv) >= 11 && !IS_DG2(dev_priv))
> +	else if (DISPLAY_VER(dev_priv) >= 11)
>   		ret = skl_pcode_request(&dev_priv->uncore, SKL_PCODE_CDCLK_CONTROL,
>   					SKL_CDCLK_PREPARE_FOR_CHANGE,
>   					SKL_CDCLK_READY_FOR_CHANGE,