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

Commit fbf49ea2 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Fix pipe off timeout handling for pre-gen4 



The current pre-gen4 pipe off code might break out of the loop
due to the timeout, but then the fail to print the warning.

Refactor the code a bit to use wait_for() to avoid the problem,
and that we also re-check the condition after the timeout has
expired.

v2: Use wait_for()

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4994aa8c

drivers/gpu/drm/i915/intel_display.c

+20 −15
Original line number Diff line number Diff line
@@ -800,6 +800,25 @@ void intel_wait_for_vblank(struct drm_device *dev, int pipe) 
		DRM_DEBUG_KMS("vblank wait timed out\n");

}



static bool pipe_dsl_stopped(struct drm_device *dev, enum pipe pipe)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 reg = PIPEDSL(pipe);

	u32 line1, line2;

	u32 line_mask;



	if (IS_GEN2(dev))

		line_mask = DSL_LINEMASK_GEN2;

	else

		line_mask = DSL_LINEMASK_GEN3;



	line1 = I915_READ(reg) & line_mask;

	mdelay(5);

	line2 = I915_READ(reg) & line_mask;



	return line1 == line2;

}



/*

 * intel_wait_for_pipe_off - wait for pipe to turn off

 * @dev: drm device
@@ -831,22 +850,8 @@ void intel_wait_for_pipe_off(struct drm_device *dev, int pipe) 
			     100))

			WARN(1, "pipe_off wait timed out\n");

	} else {

		u32 last_line, line_mask;

		int reg = PIPEDSL(pipe);

		unsigned long timeout = jiffies + msecs_to_jiffies(100);



		if (IS_GEN2(dev))

			line_mask = DSL_LINEMASK_GEN2;

		else

			line_mask = DSL_LINEMASK_GEN3;



		/* Wait for the display line to settle */

		do {

			last_line = I915_READ(reg) & line_mask;

			mdelay(5);

		} while (((I915_READ(reg) & line_mask) != last_line) &&

			 time_after(timeout, jiffies));

		if (time_after(jiffies, timeout))

		if (wait_for(pipe_dsl_stopped(dev, pipe), 100))

			WARN(1, "pipe_off wait timed out\n");

	}

}