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

Commit f19a079a authored by Chris Wilson's avatar Chris Wilson Committed by Keith Packard
Browse files

drm/i915: Remove vestigial pitch from post-gen2 FBC control routines 



The cfb_pitch was only used for 8xx_enable_fbc(), every later routine
was just overwriting the value with itself thanks to a copy'n'paste
error.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 973d04f9

drivers/gpu/drm/i915/intel_display.c

+2 −6
Original line number Diff line number Diff line
@@ -1482,8 +1482,7 @@ static void g4x_enable_fbc(struct drm_crtc *crtc, unsigned long interval) 


	dpfc_ctl = I915_READ(DPFC_CONTROL);

	if (dpfc_ctl & DPFC_CTL_EN) {

		if (dev_priv->cfb_pitch == dev_priv->cfb_pitch / 64 - 1 &&

		    dev_priv->cfb_fence == obj->fence_reg &&

		if (dev_priv->cfb_fence == obj->fence_reg &&

		    dev_priv->cfb_plane == intel_crtc->plane &&

		    dev_priv->cfb_y == crtc->y)

			return;
@@ -1492,7 +1491,6 @@ static void g4x_enable_fbc(struct drm_crtc *crtc, unsigned long interval) 
		intel_wait_for_vblank(dev, intel_crtc->pipe);

	}



	dev_priv->cfb_pitch = (dev_priv->cfb_pitch / 64) - 1;

	dev_priv->cfb_fence = obj->fence_reg;

	dev_priv->cfb_plane = intel_crtc->plane;

	dev_priv->cfb_y = crtc->y;
@@ -1572,8 +1570,7 @@ static void ironlake_enable_fbc(struct drm_crtc *crtc, unsigned long interval) 


	dpfc_ctl = I915_READ(ILK_DPFC_CONTROL);

	if (dpfc_ctl & DPFC_CTL_EN) {

		if (dev_priv->cfb_pitch == dev_priv->cfb_pitch / 64 - 1 &&

		    dev_priv->cfb_fence == obj->fence_reg &&

		if (dev_priv->cfb_fence == obj->fence_reg &&

		    dev_priv->cfb_plane == intel_crtc->plane &&

		    dev_priv->cfb_offset == obj->gtt_offset &&

		    dev_priv->cfb_y == crtc->y)
@@ -1583,7 +1580,6 @@ static void ironlake_enable_fbc(struct drm_crtc *crtc, unsigned long interval) 
		intel_wait_for_vblank(dev, intel_crtc->pipe);

	}



	dev_priv->cfb_pitch = (dev_priv->cfb_pitch / 64) - 1;

	dev_priv->cfb_fence = obj->fence_reg;

	dev_priv->cfb_plane = intel_crtc->plane;

	dev_priv->cfb_offset = obj->gtt_offset;