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

Commit 47bf17a7 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Only set CURSOR_PIPE_CSC_ENABLE when cursor is enabled 



It seems cleaner if we keep CURCNTR at 0 when the cursor is disabled,
so don't set the CURSOR_PIPE_CSC_ENABLE bit unless the cursor is
enabled.

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 99d1f387

drivers/gpu/drm/i915/intel_display.c

+3 −2
Original line number Diff line number Diff line
@@ -8301,9 +8301,10 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base) 
				return;

		}

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

	}



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

			cntl |= CURSOR_PIPE_CSC_ENABLE;

	}



	if (intel_crtc->cursor_cntl != cntl) {

		I915_WRITE(CURCNTR(pipe), cntl);