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

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

drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc() 



Move the sprite/cursor plane disabling to occur in intel_sanitize_crtc()
where it belongs instead of doing it in intel_modeset_readout_hw_state().

The plane disabling was first added in
4cf0ebbd drm/i915: Rework plane readout.

I got the idea from some patches from Partik and/or Maarten but those
moved also the plane state readout to intel_sanitize_crtc() which isn't
quite right in my opinion.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=91910


Reviewed-by: default avatarPatrik Jakobsson <patrik.jakobsson@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7f4c6284

drivers/gpu/drm/i915/intel_display.c

+20 −24
Original line number Original line Diff line number Diff line
@@ -14905,9 +14905,19 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc) 
	/* restore vblank interrupts to correct state */

	/* restore vblank interrupts to correct state */

	drm_crtc_vblank_reset(&crtc->base);

	drm_crtc_vblank_reset(&crtc->base);

	if (crtc->active) {

	if (crtc->active) {

		struct intel_plane *plane;



		drm_calc_timestamping_constants(&crtc->base, &crtc->base.hwmode);

		drm_calc_timestamping_constants(&crtc->base, &crtc->base.hwmode);

		update_scanline_offset(crtc);

		update_scanline_offset(crtc);

		drm_crtc_vblank_on(&crtc->base);

		drm_crtc_vblank_on(&crtc->base);



		/* Disable everything but the primary plane */

		for_each_intel_plane_on_crtc(dev, crtc, plane) {

			if (plane->base.type == DRM_PLANE_TYPE_PRIMARY)

				continue;



			plane->disable_plane(&plane->base, &crtc->base);

		}

	}

	}





	/* We need to sanitize the plane -> pipe mapping first because this will

	/* We need to sanitize the plane -> pipe mapping first because this will
@@ -15070,35 +15080,21 @@ void i915_redisable_vga(struct drm_device *dev) 
	i915_redisable_vga_power_on(dev);

	i915_redisable_vga_power_on(dev);

}

}





static bool primary_get_hw_state(struct intel_crtc *crtc)

static bool primary_get_hw_state(struct intel_plane *plane)

{

{

	struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);





	return !!(I915_READ(DSPCNTR(crtc->plane)) & DISPLAY_PLANE_ENABLE);

	return I915_READ(DSPCNTR(plane->plane)) & DISPLAY_PLANE_ENABLE;

}

}





static void readout_plane_state(struct intel_crtc *crtc,

/* FIXME read out full plane state for all planes */

				struct intel_crtc_state *crtc_state)

static void readout_plane_state(struct intel_crtc *crtc)

{

{

	struct intel_plane *p;

	struct intel_plane_state *plane_state =

	struct intel_plane_state *plane_state;

		to_intel_plane_state(crtc->base.primary->state);

	bool active = crtc_state->base.active;





	for_each_intel_plane(crtc->base.dev, p) {

	plane_state->visible =

		if (crtc->pipe != p->pipe)

		primary_get_hw_state(to_intel_plane(crtc->base.primary));

			continue;



		plane_state = to_intel_plane_state(p->base.state);



		if (p->base.type == DRM_PLANE_TYPE_PRIMARY)

			plane_state->visible = primary_get_hw_state(crtc);

		else {

			if (active)

				p->disable_plane(&p->base, &crtc->base);



			plane_state->visible = false;

		}

	}

}

}





static void intel_modeset_readout_hw_state(struct drm_device *dev)

static void intel_modeset_readout_hw_state(struct drm_device *dev)
@@ -15121,7 +15117,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) 
		crtc->base.state->active = crtc->active;

		crtc->base.state->active = crtc->active;

		crtc->base.enabled = crtc->active;

		crtc->base.enabled = crtc->active;





		readout_plane_state(crtc, to_intel_crtc_state(crtc->base.state));

		readout_plane_state(crtc);





		DRM_DEBUG_KMS("[CRTC:%d] hw state readout: %s\n",

		DRM_DEBUG_KMS("[CRTC:%d] hw state readout: %s\n",

			      crtc->base.base.id,

			      crtc->base.base.id,