diff options
| author | Mika Kuoppala | 2015-01-16 10:34:40 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2015-01-27 09:50:57 +0100 |
| commit | 59bad947180ddc22665e8b2b5f8f9ef65e8aab7f (patch) | |
| tree | 5cef28c2cb0fafffd83d07b3e07f5a1426fe2088 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Make vlv and chv forcewake put generic. (diff) | |
| download | kernel-qcow2-linux-59bad947180ddc22665e8b2b5f8f9ef65e8aab7f.tar.gz kernel-qcow2-linux-59bad947180ddc22665e8b2b5f8f9ef65e8aab7f.tar.xz kernel-qcow2-linux-59bad947180ddc22665e8b2b5f8f9ef65e8aab7f.zip | |
drm/i915: Rename the forcewake get/put functions
We have multiple forcewake domains now on recent gens. Change the
function naming to reflect this.
v2: More verbose names (Chris)
v3: Rebase
v4: Rebase
v5: Add documentation for forcewake_get/put
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Deepak S <deepak.s@linux.intel.com> (v2)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 61b123f1a652..8c5dfec98de1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7871,7 +7871,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. To prevent PC8 state, just enable force_wake. */ - gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL); + intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL); if (val & LCPLL_POWER_DOWN_ALLOW) { val &= ~LCPLL_POWER_DOWN_ALLOW; @@ -7901,7 +7901,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) DRM_ERROR("Switching back to LCPLL failed\n"); } - gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL); + intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL); } /* |