summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorPaulo Zanoni2013-08-02 21:22:25 +0200
committerDaniel Vetter2013-08-22 13:31:48 +0200
commit6aedd1f539f51b7b0c3d6be0088c3541f9d2c294 (patch)
tree687316402b6b7e401fc018f0c4890b7c549a9fa1 /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: check the power well when redisabling VGA (diff)
downloadkernel-qcow2-linux-6aedd1f539f51b7b0c3d6be0088c3541f9d2c294.tar.gz
kernel-qcow2-linux-6aedd1f539f51b7b0c3d6be0088c3541f9d2c294.tar.xz
kernel-qcow2-linux-6aedd1f539f51b7b0c3d6be0088c3541f9d2c294.zip
drm/i915: clarify Haswell power well bit names
Whenever I need to work with the HSW_PWER_WELL_* register bits I have to look at the documentation to find out which bit is to request the power well and which one shows its current state. Rename the bits so I won't need to look the docs every time. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f83316ec0b94..e600e1cfb6ea 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10112,7 +10112,7 @@ void i915_redisable_vga(struct drm_device *dev)
* follow the "don't touch the power well if we don't need it" policy
* the rest of the driver uses. */
if (HAS_POWER_WELL(dev) &&
- (I915_READ(HSW_PWR_WELL_DRIVER) & HSW_PWR_WELL_STATE) == 0)
+ (I915_READ(HSW_PWR_WELL_DRIVER) & HSW_PWR_WELL_STATE_ENABLED) == 0)
return;
if (I915_READ(vga_reg) != VGA_DISP_DISABLE) {