Commit 40e3defd authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Daniel Vetter
Browse files

drm/vmwgfx: Fix vmw_du_cursor_plane_atomic_check 



Use the correct helper and also return early on helper
success rather than on helper failure.

Also explicitly return 0 in the case of no fb.

v2: Check for !fb after updating state->visible (Ville).

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> (v1)
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reported-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: Sinclair Yeh <syeh@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Acked-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181004202446.22905-17-daniel.vetter@ffwll.ch
parent 6b6fce62

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+12 −12
Original line number Diff line number Diff line
@@ -493,25 +493,25 @@ int vmw_du_cursor_plane_atomic_check(struct drm_plane *plane, 
				     struct drm_plane_state *new_state)

{

	int ret = 0;

	struct drm_crtc_state *crtc_state = NULL;

	struct vmw_surface *surface = NULL;

	struct drm_framebuffer *fb = new_state->fb;



	struct drm_rect src = drm_plane_state_src(new_state);

	struct drm_rect dest = drm_plane_state_dest(new_state);



	/* Turning off */

	if (!fb)

		return ret;

	if (new_state->crtc)

		crtc_state = drm_atomic_get_new_crtc_state(new_state->state,

							   new_state->crtc);



	ret = drm_plane_helper_check_update(plane, new_state->crtc, fb,

					    &src, &dest,

					    DRM_MODE_ROTATE_0,

	ret = drm_atomic_helper_check_plane_state(new_state, crtc_state,

						  DRM_PLANE_HELPER_NO_SCALING,

						  DRM_PLANE_HELPER_NO_SCALING,

					    true, true, &new_state->visible);

	if (!ret)

						  true, true);

	if (ret)

		return ret;



	/* Turning off */

	if (!fb)

		return 0;



	/* A lot of the code assumes this */

	if (new_state->crtc_w != 64 || new_state->crtc_h != 64) {

		DRM_ERROR("Invalid cursor dimensions (%d, %d)\n",