Commit b3dc685e authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915/bdw: add Broadwell sprite/plane/cursor checks 



Just make Broadwell follow the same code paths as Haswell here,
instead of running code for the even-older platforms.

v2: Shuffle around Ben's vma prep work.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> (v1)
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4b30553d

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -2176,7 +2176,7 @@ static int ironlake_update_plane(struct drm_crtc *crtc, 
	I915_WRITE(DSPSTRIDE(plane), fb->pitches[0]);

	I915_MODIFY_DISPBASE(DSPSURF(plane),

			     i915_gem_obj_ggtt_offset(obj) + intel_crtc->dspaddr_offset);

	if (IS_HASWELL(dev)) {

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

		I915_WRITE(DSPOFFSET(plane), (y << 16) | x);

	} else {

		I915_WRITE(DSPTILEOFF(plane), (y << 16) | x);
@@ -7199,7 +7199,7 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc, 
	if (!visible && !intel_crtc->cursor_visible)

		return;



	if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) {

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

		I915_WRITE(CURPOS_IVB(pipe), pos);

		ivb_update_cursor(crtc, base);

	} else {

drivers/gpu/drm/i915/intel_sprite.c

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


	/* HSW consolidates SPRTILEOFF and SPRLINOFF into a single SPROFFSET

	 * register */

	if (IS_HASWELL(dev))

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

		I915_WRITE(SPROFFSET(pipe), (y << 16) | x);

	else if (obj->tiling_mode != I915_TILING_NONE)

		I915_WRITE(SPRTILEOFF(pipe), (y << 16) | x);