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

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

drm/i915: Always call intel_update_sprite_watermarks() when disabling a plane 



ILK and VLV codepaths didn't update sprite watermarks when disabling a
sprite. Make them do that.

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 adf3d35e

drivers/gpu/drm/i915/intel_sprite.c

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ vlv_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc) 
	/* Activate double buffered register update */

	I915_MODIFY_DISPBASE(SPSURF(pipe, plane), 0);

	POSTING_READ(SPSURF(pipe, plane));



	intel_update_sprite_watermarks(dplane, crtc, 0, 0, false, false);

}



static int
@@ -504,6 +506,8 @@ ilk_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc) 
	/* Flush double buffered register updates */

	I915_MODIFY_DISPBASE(DVSSURF(pipe), 0);

	POSTING_READ(DVSSURF(pipe));



	intel_update_sprite_watermarks(plane, crtc, 0, 0, false, false);

}



static void