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

Commit 65a21cd6 authored by Jesse Barnes's avatar Jesse Barnes Committed by Keith Packard
Browse files

drm/i915: fix IVB cursor support 



The cursor regs have moved around, add the offsets and new macros for
getting at them.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Tested-By: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-By: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent f7cb34d4

drivers/gpu/drm/i915/i915_reg.h

+8 −0
Original line number Diff line number Diff line
@@ -2573,10 +2573,18 @@ 
#define _CURBBASE		0x700c4

#define _CURBPOS			0x700c8



#define _CURBCNTR_IVB		0x71080

#define _CURBBASE_IVB		0x71084

#define _CURBPOS_IVB		0x71088



#define CURCNTR(pipe) _PIPE(pipe, _CURACNTR, _CURBCNTR)

#define CURBASE(pipe) _PIPE(pipe, _CURABASE, _CURBBASE)

#define CURPOS(pipe) _PIPE(pipe, _CURAPOS, _CURBPOS)



#define CURCNTR_IVB(pipe) _PIPE(pipe, _CURACNTR, _CURBCNTR_IVB)

#define CURBASE_IVB(pipe) _PIPE(pipe, _CURABASE, _CURBBASE_IVB)

#define CURPOS_IVB(pipe) _PIPE(pipe, _CURAPOS, _CURBPOS_IVB)



/* Display A control */

#define _DSPACNTR                0x70180

#define   DISPLAY_PLANE_ENABLE			(1<<31)

drivers/gpu/drm/i915/intel_display.c

+35 −5
Original line number Diff line number Diff line
@@ -5998,6 +5998,31 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base) 
	I915_WRITE(CURBASE(pipe), base);

}



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;

	bool visible = base != 0;



	if (intel_crtc->cursor_visible != visible) {

		uint32_t cntl = I915_READ(CURCNTR_IVB(pipe));

		if (base) {

			cntl &= ~CURSOR_MODE;

			cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;

		} else {

			cntl &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE);

			cntl |= CURSOR_MODE_DISABLE;

		}

		I915_WRITE(CURCNTR_IVB(pipe), cntl);



		intel_crtc->cursor_visible = visible;

	}

	/* and commit changes on next vblank */

	I915_WRITE(CURBASE_IVB(pipe), base);

}



/* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */

static void intel_crtc_update_cursor(struct drm_crtc *crtc,

				     bool on)
@@ -6045,11 +6070,16 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc, 
	if (!visible && !intel_crtc->cursor_visible)

		return;



	if (IS_IVYBRIDGE(dev)) {

		I915_WRITE(CURPOS_IVB(pipe), pos);

		ivb_update_cursor(crtc, base);

	} else {

		I915_WRITE(CURPOS(pipe), pos);

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

			i845_update_cursor(crtc, base);

		else

			i9xx_update_cursor(crtc, base);

	}



	if (visible)

		intel_mark_busy(dev, to_intel_framebuffer(crtc->fb)->obj);