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

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
...@@ -493,24 +493,24 @@ int vmw_du_cursor_plane_atomic_check(struct drm_plane *plane, ...@@ -493,24 +493,24 @@ int vmw_du_cursor_plane_atomic_check(struct drm_plane *plane,
struct drm_plane_state *new_state) struct drm_plane_state *new_state)
{ {
int ret = 0; int ret = 0;
struct drm_crtc_state *crtc_state = NULL;
struct vmw_surface *surface = NULL; struct vmw_surface *surface = NULL;
struct drm_framebuffer *fb = new_state->fb; struct drm_framebuffer *fb = new_state->fb;
struct drm_rect src = drm_plane_state_src(new_state); if (new_state->crtc)
struct drm_rect dest = drm_plane_state_dest(new_state); crtc_state = drm_atomic_get_new_crtc_state(new_state->state,
new_state->crtc);
/* Turning off */ ret = drm_atomic_helper_check_plane_state(new_state, crtc_state,
if (!fb) DRM_PLANE_HELPER_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING,
true, true);
if (ret)
return ret; return ret;
ret = drm_plane_helper_check_update(plane, new_state->crtc, fb, /* Turning off */
&src, &dest, if (!fb)
DRM_MODE_ROTATE_0, return 0;
DRM_PLANE_HELPER_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING,
true, true, &new_state->visible);
if (!ret)
return ret;
/* A lot of the code assumes this */ /* A lot of the code assumes this */
if (new_state->crtc_w != 64 || new_state->crtc_h != 64) { if (new_state->crtc_w != 64 || new_state->crtc_h != 64) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment