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

Commit 51660e0e authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: gen2: move error capture of IER to its correct place 



While checking the error capture path I noticed that this register is
read twice for GEN2, so fix this and also move the read where it's done
for other platforms.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f454c694

drivers/gpu/drm/i915/i915_gpu_error.c

+4 −4
Original line number Diff line number Diff line
@@ -1054,9 +1054,6 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, 
		error->gfx_mode = I915_READ(GFX_MODE);

	}



	if (IS_GEN2(dev))

		error->ier = I915_READ16(IER);



	/* 2: Registers which belong to multiple generations */

	if (INTEL_INFO(dev)->gen >= 7)

		error->forcewake = I915_READ(FORCEWAKE_MT);
@@ -1080,6 +1077,9 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, 
	if (HAS_PCH_SPLIT(dev))

		error->ier = I915_READ(DEIER) | I915_READ(GTIER);

	else {

		if (IS_GEN2(dev))

			error->ier = I915_READ16(IER);

		else

			error->ier = I915_READ(IER);

		for_each_pipe(pipe)

			error->pipestat[pipe] = I915_READ(PIPESTAT(pipe));