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

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

drm/i915: Set primary_disabled in intel_{enable, disable}_plane 



If the primary gets marked as disabled while the pipe is off for
instance, we should still re-enable it when the pipe is turned on,
unless the sprite covers it fully also in that configuration.
Unfortunately we do the plane visibility checks only in the sprite code,
which is executed after the primary enabling when turning the pipe off.

Ideally we should compute the plane visibility before touching the
hardware at all, but for now just set the primary_disabld flag
in intel_{enable,disable}_plane.

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 3def84b3

drivers/gpu/drm/i915/intel_display.c

+8 −0
Original line number Diff line number Diff line
@@ -1832,12 +1832,16 @@ void intel_flush_display_plane(struct drm_i915_private *dev_priv, 
static void intel_enable_plane(struct drm_i915_private *dev_priv,

			       enum plane plane, enum pipe pipe)

{

	struct intel_crtc *intel_crtc =

		to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);

	int reg;

	u32 val;



	/* If the pipe isn't enabled, we can't pump pixels and may hang */

	assert_pipe_enabled(dev_priv, pipe);



	intel_crtc->primary_disabled = false;



	reg = DSPCNTR(plane);

	val = I915_READ(reg);

	if (val & DISPLAY_PLANE_ENABLE)
@@ -1859,9 +1863,13 @@ static void intel_enable_plane(struct drm_i915_private *dev_priv, 
static void intel_disable_plane(struct drm_i915_private *dev_priv,

				enum plane plane, enum pipe pipe)

{

	struct intel_crtc *intel_crtc =

		to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);

	int reg;

	u32 val;



	intel_crtc->primary_disabled = true;



	reg = DSPCNTR(plane);

	val = I915_READ(reg);

	if ((val & DISPLAY_PLANE_ENABLE) == 0)