[PATCH 2/6] drm/vmwgfx: Create mouse hotspot properties on cursor planes

[Martin Krastev (VMware)]

From: Martin Krastev <krastevm at vmware.com>

On 2.06.22 г. 18:42 ч., Zack Rusin wrote:
> From: Zack Rusin <zackr at vmware.com>
>
> Atomic modesetting got support for mouse hotspots via the hotspot
> properties. Drivers need to create those properties on cursor planes
> which require the mouse hotspot coordinates.
>
> Add the code creating hotspot properties and port away from old legacy
> hotspot API. The legacy hotspot paths have an implementation that works
> with new atomic properties so there's no reason to keep them and it
> makes sense to unify both paths.
>
> Signed-off-by: Zack Rusin <zackr at vmware.com>
> Cc: Martin Krastev <krastevm at vmware.com>
> Cc: Maaz Mombasawala <mombasawalam at vmware.com>
> ---
>   drivers/gpu/drm/vmwgfx/vmwgfx_kms.c  | 11 ++---------
>   drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c  |  2 ++
>   drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c |  1 +
>   drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c |  2 ++
>   4 files changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> index 693028c31b6b..a4cd312fee46 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> @@ -652,13 +652,8 @@ vmw_du_cursor_plane_atomic_update(struct drm_plane *plane,
>   	struct vmw_plane_state *vps = vmw_plane_state_to_vps(new_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;
> @@ -2270,8 +2265,6 @@ int vmw_du_crtc_gamma_set(struct drm_crtc *crtc,
>   	int i;
>   
>   	for (i = 0; i < size; i++) {
> -		DRM_DEBUG("%d r/g/b = 0x%04x / 0x%04x / 0x%04x\n", i,
> -			  r[i], g[i], b[i]);
>   		vmw_write(dev_priv, SVGA_PALETTE_BASE + i * 3 + 0, r[i] >> 8);
>   		vmw_write(dev_priv, SVGA_PALETTE_BASE + i * 3 + 1, g[i] >> 8);
>   		vmw_write(dev_priv, SVGA_PALETTE_BASE + i * 3 + 2, b[i] >> 8);
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> index e4347faccee0..43e89c6755b2 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> @@ -474,6 +474,8 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
>   			(&connector->base,
>   			 dev_priv->implicit_placement_property,
>   			 1);
> +	if (vmw_cmd_supported(dev_priv))
> +		drm_plane_create_hotspot_properties(&cursor->base);
>   
>   	return 0;
>   
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> index c89ad3a2d141..8d46b0cbe640 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> @@ -932,6 +932,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
>   				   dev->mode_config.suggested_x_property, 0);
>   	drm_object_attach_property(&connector->base,
>   				   dev->mode_config.suggested_y_property, 0);
> +	drm_plane_create_hotspot_properties(&cursor->base);
>   	return 0;
>   
>   err_free_unregister:
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> index eb014b97d156..d940b9a525e7 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> @@ -1822,6 +1822,8 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
>   				   dev->mode_config.suggested_x_property, 0);
>   	drm_object_attach_property(&connector->base,
>   				   dev->mode_config.suggested_y_property, 0);
> +	drm_plane_create_hotspot_properties(&cursor->base);
> +
>   	return 0;
>   
>   err_free_unregister:


LGTM!

Reviewed-by: Martin Krastev <krastevm at vmware.com>


Regards,

Martin