diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-16 04:36:05 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-16 04:44:30 -0500 |
| commit | 9035a97a32836d0e456ddafaaf249a844e6e4b5e (patch) | |
| tree | 41ec3db083bdb46cd831f0d39db1fe294ae7d55f /drivers/gpu/drm/i915/i915_drv.h | |
| parent | fe16d949b45036d9f80e20e07bde1ddacc930b10 (diff) | |
| parent | 452858338aec31c1f4414bf07f31663690479869 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index f9e9f9840dea..92f4d33216cd 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -963,6 +963,7 @@ extern unsigned int i915_powersave; | |||
| 963 | extern unsigned int i915_lvds_downclock; | 963 | extern unsigned int i915_lvds_downclock; |
| 964 | extern unsigned int i915_panel_use_ssc; | 964 | extern unsigned int i915_panel_use_ssc; |
| 965 | extern int i915_vbt_sdvo_panel_type; | 965 | extern int i915_vbt_sdvo_panel_type; |
| 966 | extern unsigned int i915_enable_rc6; | ||
| 966 | 967 | ||
| 967 | extern int i915_suspend(struct drm_device *dev, pm_message_t state); | 968 | extern int i915_suspend(struct drm_device *dev, pm_message_t state); |
| 968 | extern int i915_resume(struct drm_device *dev); | 969 | extern int i915_resume(struct drm_device *dev); |