| From 775d17b6ca4357048f36c22151335addfe15db4b Mon Sep 17 00:00:00 2001 |
| From: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Date: Sun, 9 Oct 2011 21:52:01 +0200 |
| Subject: drm/i915: Ivybridge still has fences! |
| |
| From: Daniel Vetter <daniel.vetter@ffwll.ch> |
| |
| commit 775d17b6ca4357048f36c22151335addfe15db4b upstream. |
| |
| So don't forget to restore them on resume and dump them into |
| the error state. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/gpu/drm/i915/i915_irq.c | 1 + |
| drivers/gpu/drm/i915/i915_suspend.c | 2 ++ |
| 2 files changed, 3 insertions(+) |
| |
| --- a/drivers/gpu/drm/i915/i915_irq.c |
| +++ b/drivers/gpu/drm/i915/i915_irq.c |
| @@ -820,6 +820,7 @@ static void i915_gem_record_fences(struc |
| |
| /* Fences */ |
| switch (INTEL_INFO(dev)->gen) { |
| + case 7: |
| case 6: |
| for (i = 0; i < 16; i++) |
| error->fence[i] = I915_READ64(FENCE_REG_SANDYBRIDGE_0 + (i * 8)); |
| --- 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 |
| |
| /* 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(str |
| |
| /* 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]); |