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/i915_drv.c | |
| parent | ac165b006bd877e240174edecd855d4eb005ffae (diff) | |
| parent | b1289371fcd580b4c412e6d05c4cb8ac8d277239 (diff) | |
| download | talos-obmc-linux-7ac8833f5920a4a58190743697c9c8920c2fab4e.tar.gz talos-obmc-linux-7ac8833f5920a4a58190743697c9c8920c2fab4e.zip | |
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/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 0a8eceb75902..e9b57893db2b 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -125,6 +125,11 @@ MODULE_PARM_DESC(preliminary_hw_support, "Enable Haswell and ValleyView Support. " "(default: false)"); +int i915_disable_power_well __read_mostly = 0; +module_param_named(disable_power_well, i915_disable_power_well, int, 0600); +MODULE_PARM_DESC(disable_power_well, + "Disable the power well when possible (default: false)"); + static struct drm_driver driver; extern int intel_agp_enabled; |
