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

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

drm/i915: Unify ivb_update_cursor() and i9xx_update_cursor() 



Ever since
 commit 5efb3e28
 Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
 Date:   Wed Apr 9 13:28:53 2014 +0300

    drm/i915/chv: Add cursor pipe offsets

the only difference between i9xx_update_cursor() and ivb_update_cursor()
was the hsw+ pipe csc handling. Let's unify them and we can rid
outselves of some duplicated code.

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 d7ce484e

drivers/gpu/drm/i915/intel_display.c

+1 −40
Original line number Diff line number Diff line
@@ -8104,43 +8104,6 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base) 
		}

		cntl |= pipe << 28; /* Connect to correct pipe */

	}

	if (intel_crtc->cursor_cntl != cntl) {

		I915_WRITE(CURCNTR(pipe), cntl);

		POSTING_READ(CURCNTR(pipe));

		intel_crtc->cursor_cntl = cntl;

	}



	/* and commit changes on next vblank */

	I915_WRITE(CURBASE(pipe), base);

	POSTING_READ(CURBASE(pipe));

}



static void ivb_update_cursor(struct drm_crtc *crtc, u32 base)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	int pipe = intel_crtc->pipe;

	uint32_t cntl;



	cntl = 0;

	if (base) {

		cntl = MCURSOR_GAMMA_ENABLE;

		switch (intel_crtc->cursor_width) {

			case 64:

				cntl |= CURSOR_MODE_64_ARGB_AX;

				break;

			case 128:

				cntl |= CURSOR_MODE_128_ARGB_AX;

				break;

			case 256:

				cntl |= CURSOR_MODE_256_ARGB_AX;

				break;

			default:

				WARN_ON(1);

				return;

		}

	}

	if (IS_HASWELL(dev) || IS_BROADWELL(dev))

		cntl |= CURSOR_PIPE_CSC_ENABLE;
@@ -8199,9 +8162,7 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc, 


	I915_WRITE(CURPOS(pipe), pos);



	if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev) || IS_BROADWELL(dev))

		ivb_update_cursor(crtc, base);

	else if (IS_845G(dev) || IS_I865G(dev))

	if (IS_845G(dev) || IS_I865G(dev))

		i845_update_cursor(crtc, base);

	else

		i9xx_update_cursor(crtc, base);