diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-24 15:14:41 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-25 19:23:28 +0000 |
| commit | 500f7147cf5bafd139056d521536b10c2bc2e154 (patch) | |
| tree | ee18c9c05fa929d716bbd1c06d84549e197a9a36 /drivers/gpu | |
| parent | eb03355660b44cf6b1ed2f895085b9de8f74efbc (diff) | |
| download | linux-stable-500f7147cf5bafd139056d521536b10c2bc2e154.tar.gz linux-stable-500f7147cf5bafd139056d521536b10c2bc2e154.tar.bz2 linux-stable-500f7147cf5bafd139056d521536b10c2bc2e154.zip | |
drm/i915: Reset state after a GPU reset or resume
Call drm_mode_config_reset() after an invalidation event to restore any
cached state to unknown.
Tested-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu')
| -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 66796bb82d3e..e517447b0880 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -354,6 +354,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 */ @@ -542,6 +543,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); } |