Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1216444 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: use the correct force_wake function at the PC8 code 



When I submitted the first patch adding these force wake functions,
Chris Wilson observed that I was using the wrong functions, so I sent
a second version of the patch to correct this problem. The problem is
that v1 was merged instead of v2.

I was able to notice the problem when running the
debugfs-forcewake-user subtest of pm_pc8 from intel-gpu-tools.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 32cf0cb0

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -6402,7 +6402,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) 


	/* Make sure we're not on PC8 state before disabling PC8, otherwise

	 * we'll hang the machine! */

	dev_priv->uncore.funcs.force_wake_get(dev_priv);

	gen6_gt_force_wake_get(dev_priv);



	if (val & LCPLL_POWER_DOWN_ALLOW) {

		val &= ~LCPLL_POWER_DOWN_ALLOW;
@@ -6436,7 +6436,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) 
			DRM_ERROR("Switching back to LCPLL failed\n");

	}



	dev_priv->uncore.funcs.force_wake_put(dev_priv);

	gen6_gt_force_wake_put(dev_priv);

}



void hsw_enable_pc8_work(struct work_struct *__work)