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

Commit 75343a44 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Drop useless posting reads from cursor commit 



There should be no need to do posting reads between all the cursor
register accessess. Let's just drop them.

v2: Rebase due to I915_WRITE_FW() and uncore.lock

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #v1
Link: http://patchwork.freedesktop.org/patch/msgid/20170327185546.2977-8-ville.syrjala@linux.intel.com
parent b2d03b0d

drivers/gpu/drm/i915/intel_display.c

+15 −17
Original line number Diff line number Diff line
@@ -9232,30 +9232,28 @@ static void i845_update_cursor(struct intel_plane *plane, 
		 * whilst the cursor is disabled.

		 */

		I915_WRITE_FW(CURCNTR(PIPE_A), 0);

		POSTING_READ_FW(CURCNTR(PIPE_A));

		plane->cursor.cntl = 0;

	}



	if (plane->cursor.base != base) {

	if (plane->cursor.base != base)

		I915_WRITE_FW(CURBASE(PIPE_A), base);

		plane->cursor.base = base;

	}



	if (plane->cursor.size != size) {

	if (plane->cursor.size != size)

		I915_WRITE_FW(CURSIZE, size);

		plane->cursor.size = size;

	}



	if (cntl)

		I915_WRITE_FW(CURPOS(PIPE_A), pos);



	if (plane->cursor.cntl != cntl) {

	if (plane->cursor.cntl != cntl)

		I915_WRITE_FW(CURCNTR(PIPE_A), cntl);



	POSTING_READ_FW(CURCNTR(PIPE_A));

		plane->cursor.cntl = cntl;

	}



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);



	plane->cursor.cntl = cntl;

	plane->cursor.base = base;

	plane->cursor.size = size;

}



static void i845_disable_cursor(struct intel_plane *plane,
@@ -9318,21 +9316,21 @@ static void i9xx_update_cursor(struct intel_plane *plane, 


	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);



	if (plane->cursor.cntl != cntl) {

	if (plane->cursor.cntl != cntl)

		I915_WRITE_FW(CURCNTR(pipe), cntl);

		POSTING_READ_FW(CURCNTR(pipe));

		plane->cursor.cntl = cntl;

	}



	if (cntl)

		I915_WRITE_FW(CURPOS(pipe), pos);



	/* and commit changes on next vblank */

	if (plane->cursor.cntl != cntl ||

	    plane->cursor.base != base)

		I915_WRITE_FW(CURBASE(pipe), base);



	POSTING_READ_FW(CURBASE(pipe));



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);



	plane->cursor.cntl = cntl;

	plane->cursor.base = base;

}