Commit f9e711e9 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter

drm/i915: protect HSW power well check with IS_HASWELL in redisable_vga

This may need work if other platforms do the same thing, but in the
meantime we should avoid looking at HSW specific bits in this generic
function.
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
[added IS_BROADWELL too as that needs the same handling (Imre)]
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
[danvet: Add Imre's missing sob.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 190be112
...@@ -11032,7 +11032,7 @@ void i915_redisable_vga(struct drm_device *dev) ...@@ -11032,7 +11032,7 @@ void i915_redisable_vga(struct drm_device *dev)
* level, just check if the power well is enabled instead of trying to * level, just check if the power well is enabled instead of trying to
* follow the "don't touch the power well if we don't need it" policy * follow the "don't touch the power well if we don't need it" policy
* the rest of the driver uses. */ * the rest of the driver uses. */
if (HAS_POWER_WELL(dev) && if ((IS_HASWELL(dev) || IS_BROADWELL(dev)) &&
(I915_READ(HSW_PWR_WELL_DRIVER) & HSW_PWR_WELL_STATE_ENABLED) == 0) (I915_READ(HSW_PWR_WELL_DRIVER) & HSW_PWR_WELL_STATE_ENABLED) == 0)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment