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

Commit 328d8e82 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Use pipe config state to control gmch pfit enable/disable 



Allows us to rip out a few fragile checks (which are duplicated in the
hw state readout now, too). Also prepares us a bit for more than one
panel/pfit.

Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3f8dce3a

drivers/gpu/drm/i915/intel_display.c

+7 −13
Original line number Diff line number Diff line
@@ -3624,8 +3624,7 @@ static void i9xx_pfit_enable(struct intel_crtc *crtc) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc_config *pipe_config = &crtc->config;



	if (!(intel_pipe_has_type(&crtc->base, INTEL_OUTPUT_EDP) ||

	      intel_pipe_has_type(&crtc->base, INTEL_OUTPUT_LVDS)))

	if (!crtc->config.gmch_pfit.control)

		return;



	WARN_ON(I915_READ(PFIT_CONTROL) & PFIT_ENABLE);
@@ -3744,21 +3743,16 @@ static void i9xx_pfit_disable(struct intel_crtc *crtc) 
{

	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	enum pipe pipe;

	uint32_t pctl = I915_READ(PFIT_CONTROL);



	assert_pipe_disabled(dev_priv, crtc->pipe);

	if (!crtc->config.gmch_pfit.control)

		return;



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

		pipe = (pctl & PFIT_PIPE_MASK) >> PFIT_PIPE_SHIFT;

	else

		pipe = PIPE_B;

	assert_pipe_disabled(dev_priv, crtc->pipe);



	if (pipe == crtc->pipe) {

		DRM_DEBUG_DRIVER("disabling pfit, current: 0x%08x\n", pctl);

	DRM_DEBUG_DRIVER("disabling pfit, current: 0x%08x\n",

			 I915_READ(PFIT_CONTROL));

	I915_WRITE(PFIT_CONTROL, 0);

}

}



static void i9xx_crtc_disable(struct drm_crtc *crtc)

{