Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 775d17b6 authored Oct 09, 2011 by Daniel Vetter Committed by Keith Packard Nov 03, 2011

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>

parent 616fdb5a

drivers/gpu/drm/i915/i915_irq.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -824,6 +824,7 @@ static void i915_gem_record_fences(struct drm_device *dev,

		/* 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));

drivers/gpu/drm/i915/i915_suspend.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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]);