Message ID | 20230627035839.496399-4-zack@kde.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Fix cursor planes with virtualized drivers | expand |
Zack Rusin <zack@kde.org> writes: > From: Zack Rusin <zackr@vmware.com> > > Atomic modesetting got support for mouse hotspots via the hotspot > properties. Port the legacy kms hotspot handling to the new properties > on cursor planes. > > Signed-off-by: Zack Rusin <zackr@vmware.com> > Cc: Martin Krastev <krastevm@vmware.com> > Cc: Maaz Mombasawala <mombasawalam@vmware.com> > --- Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
From: Martin Krastev <krastevm@vmware.com> Looks good. Reviewed-by: Martin Krastev <krastevm@vmware.com> Regards, Martin On 27.06.23 г. 6:58 ч., Zack Rusin wrote: > From: Zack Rusin <zackr@vmware.com> > > Atomic modesetting got support for mouse hotspots via the hotspot > properties. Port the legacy kms hotspot handling to the new properties > on cursor planes. > > Signed-off-by: Zack Rusin <zackr@vmware.com> > Cc: Martin Krastev <krastevm@vmware.com> > Cc: Maaz Mombasawala <mombasawalam@vmware.com> > --- > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c > index b62207be3363..de294dfe05d0 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c > @@ -768,13 +768,8 @@ vmw_du_cursor_plane_atomic_update(struct drm_plane *plane, > struct vmw_plane_state *old_vps = vmw_plane_state_to_vps(old_state); > s32 hotspot_x, hotspot_y; > > - hotspot_x = du->hotspot_x; > - hotspot_y = du->hotspot_y; > - > - if (new_state->fb) { > - hotspot_x += new_state->fb->hot_x; > - hotspot_y += new_state->fb->hot_y; > - } > + hotspot_x = du->hotspot_x + new_state->hotspot_x; > + hotspot_y = du->hotspot_y + new_state->hotspot_y; > > du->cursor_surface = vps->surf; > du->cursor_bo = vps->bo;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index b62207be3363..de294dfe05d0 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -768,13 +768,8 @@ vmw_du_cursor_plane_atomic_update(struct drm_plane *plane, struct vmw_plane_state *old_vps = vmw_plane_state_to_vps(old_state); s32 hotspot_x, hotspot_y; - hotspot_x = du->hotspot_x; - hotspot_y = du->hotspot_y; - - if (new_state->fb) { - hotspot_x += new_state->fb->hot_x; - hotspot_y += new_state->fb->hot_y; - } + hotspot_x = du->hotspot_x + new_state->hotspot_x; + hotspot_y = du->hotspot_y + new_state->hotspot_y; du->cursor_surface = vps->surf; du->cursor_bo = vps->bo;