diff options
| author | Paulo Zanoni | 2013-03-22 18:14:13 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2013-04-18 09:43:22 +0200 |
| commit | 15d199ea1f3e2b960b0efccca2cdd0ba40a31f3c (patch) | |
| tree | bcabf231803e7d01071d01a312d54e9628dc40a4 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: don't check inconsistent modeset state when force-restoring (diff) | |
| download | kernel-qcow2-linux-15d199ea1f3e2b960b0efccca2cdd0ba40a31f3c.tar.gz kernel-qcow2-linux-15d199ea1f3e2b960b0efccca2cdd0ba40a31f3c.tar.xz kernel-qcow2-linux-15d199ea1f3e2b960b0efccca2cdd0ba40a31f3c.zip | |
drm/i915: add intel_using_power_well
It returns true if we've requested to turn the power well on and it's
really on. It also returns true for all the previous gens.
For now there's just one caller, but I'm going to add more.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
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 457a0a03c063..236d268d809c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1227,8 +1227,8 @@ void assert_pipe(struct drm_i915_private *dev_priv, if (pipe == PIPE_A && dev_priv->quirks & QUIRK_PIPEA_FORCE) state = true; - if (IS_HASWELL(dev_priv->dev) && cpu_transcoder != TRANSCODER_EDP && - !(I915_READ(HSW_PWR_WELL_DRIVER) & HSW_PWR_WELL_ENABLE)) { + if (!intel_using_power_well(dev_priv->dev) && + cpu_transcoder != TRANSCODER_EDP) { cur_state = false; } else { reg = PIPECONF(cpu_transcoder); |