Commit b9279e9b authored by Stanislav Lisovskiy's avatar Stanislav Lisovskiy
Browse files

drm/i915: Fix wrong condition in bxt_set_cdclk for DG2 



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: ceb0cc3b ("drm/i915: Communicate display power demands to pcode")
Signed-off-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Reviewed-by: default avatarVinod Govindapillai <vinod.govindapillai@intel.com>
Reviewed-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230506144217.26075-1-stanislav.lisovskiy@intel.com
parent dafa65d1

drivers/gpu/drm/i915/display/intel_cdclk.c

+2 −2
Original line number Diff line number Diff line
@@ -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,