diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-01 08:49:07 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-01 08:49:14 +0000 |
| commit | 4a1dc3ff68807bf3c76563bf439166854d063adc (patch) | |
| tree | f8b4f2933461424ff4ceb7d356e51ab98898b031 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | 72557b4f326ac2f7d469ae5a35fab57e13d9a602 (diff) | |
| parent | 78c6e170badd22c86a5b50a7eb038a02024b8f03 (diff) | |
| download | lwn-4a1dc3ff68807bf3c76563bf439166854d063adc.tar.gz lwn-4a1dc3ff68807bf3c76563bf439166854d063adc.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Merge resume fixes from -fixes and an important fix for SDVO GMBUS.
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index db13d4d46042..c0bfad2948af 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -357,6 +357,7 @@ static int i915_drm_thaw(struct drm_device *dev) error = i915_gem_init_ringbuffer(dev); mutex_unlock(&dev->struct_mutex); + drm_mode_config_reset(dev); drm_irq_install(dev); /* Resume the modeset for every activated CRTC */ @@ -545,6 +546,7 @@ int i915_reset(struct drm_device *dev, u8 flags) mutex_unlock(&dev->struct_mutex); drm_irq_uninstall(dev); + drm_mode_config_reset(dev); drm_irq_install(dev); mutex_lock(&dev->struct_mutex); } |