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

Commit 87f8ebf3 authored by Chris Wilson's avatar Chris Wilson Committed by Eric Anholt
Browse files

drm/i915: Disable the cursor for DPMS_OFF 



The comments have long desired that we should switch off the cursor
along with the display plane, make it so.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 6146b3d6

drivers/gpu/drm/i915/intel_display.c

+4 −4
Original line number Diff line number Diff line
@@ -2470,9 +2470,6 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode) 


/**

 * Sets the power management mode of the pipe and plane.

 *

 * This code should probably grow support for turning the cursor off and back

 * on appropriately at the same time as we're turning the pipe off/on.

 */

static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)

{
@@ -2487,6 +2484,9 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode) 


	intel_crtc->dpms_mode = mode;



	intel_crtc->cursor_on = mode == DRM_MODE_DPMS_ON;

	intel_crtc_update_cursor(crtc);



	if (!dev->primary->master)

		return;
@@ -4242,7 +4242,7 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc) 


	pos = 0;



	if (crtc->fb) {

	if (intel_crtc->cursor_on && crtc->fb) {

		base = intel_crtc->cursor_addr;

		if (x > (int) crtc->fb->width)

			base = 0;

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ struct intel_crtc { 
	uint32_t cursor_addr;

	int16_t cursor_x, cursor_y;

	int16_t cursor_width, cursor_height;

	bool cursor_visble;

	bool cursor_visble, cursor_on;

};



#define to_intel_crtc(x) container_of(x, struct intel_crtc, base)