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

Commit 6bbfa1c5 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915/bdw: Use pipe CSC on Broadwell 



Route cursor and sprite data through the pipe CSC unit on BDW.
Primary plane data is already sent through the pipe CSC.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e39bf98a

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -7172,7 +7172,7 @@ static void ivb_update_cursor(struct drm_crtc *crtc, u32 base) 
			cntl &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE);

			cntl |= CURSOR_MODE_DISABLE;

		}

		if (IS_HASWELL(dev)) {

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

			cntl |= CURSOR_PIPE_CSC_ENABLE;

			cntl &= ~CURSOR_TRICKLE_FEED_DISABLE;

		}

drivers/gpu/drm/i915/intel_sprite.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 


	sprctl |= SPRITE_ENABLE;



	if (IS_HASWELL(dev))

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

		sprctl |= SPRITE_PIPE_CSC_ENABLE;



	intel_update_sprite_watermarks(plane, crtc, src_w, pixel_size, true,