diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-10-09 23:52:01 +0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-11-03 20:20:00 +0400 |
| commit | 775d17b6ca4357048f36c22151335addfe15db4b (patch) | |
| tree | 90010de6b7fdbedde4699064f2f3f79ab5810dff /drivers/gpu/drm/i915/i915_suspend.c | |
| parent | 616fdb5afb12b4d5bb9e36df40d039e86aaaefc2 (diff) | |
| download | linux-775d17b6ca4357048f36c22151335addfe15db4b.tar.xz | |
drm/i915: Ivybridge still has fences!
So don't forget to restore them on resume and dump them into
the error state.
Cc: stable@kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_suspend.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index f8f602d76650..7886e4fb60e3 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -370,6 +370,7 @@ static void i915_save_modeset_reg(struct drm_device *dev) /* Fences */ switch (INTEL_INFO(dev)->gen) { + case 7: case 6: for (i = 0; i < 16; i++) dev_priv->saveFENCE[i] = I915_READ64(FENCE_REG_SANDYBRIDGE_0 + (i * 8)); @@ -404,6 +405,7 @@ static void i915_restore_modeset_reg(struct drm_device *dev) /* Fences */ switch (INTEL_INFO(dev)->gen) { + case 7: case 6: for (i = 0; i < 16; i++) I915_WRITE64(FENCE_REG_SANDYBRIDGE_0 + (i * 8), dev_priv->saveFENCE[i]); |