diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-03-25 12:20:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-03-25 12:20:00 +1000 |
| commit | 7ac8833f5920a4a58190743697c9c8920c2fab4e (patch) | |
| tree | 74c788686275e1c2d281502eb51f7701f34c4279 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | ac165b006bd877e240174edecd855d4eb005ffae (diff) | |
| parent | b1289371fcd580b4c412e6d05c4cb8ac8d277239 (diff) | |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into HEAD
Daniel writes:
"Just three revert/disable by default patches, one of them cc: stable
(since the offending commit was cc: stable, too)."
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
Revert "drm/i915: write backlight harder"
drm/i915: don't disable the power well yet
Revert "drm/i915: set TRANSCODER_EDP even earlier"
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index a1794c6df1b..adca00783e6 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4079,6 +4079,9 @@ void intel_set_power_well(struct drm_device *dev, bool enable) if (!IS_HASWELL(dev)) return; + if (!i915_disable_power_well && !enable) + return; + tmp = I915_READ(HSW_PWR_WELL_DRIVER); is_enabled = tmp & HSW_PWR_WELL_STATE; enable_requested = tmp & HSW_PWR_WELL_ENABLE; |