diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-07-24 15:57:28 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-07-24 15:57:28 +1000 |
| commit | 739b000994b7c813e4cac56c077abd8f6b0ccaab (patch) | |
| tree | 469be35535b2db6eb5fbd2dcece50bbe45c22e2a /drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | |
| parent | 507e8e5e5d3fd640e24420be9cbd1c50190bdb4a (diff) | |
| parent | 8046306fb9dedf216fc37a7dadc0e35ce37e9567 (diff) | |
| download | lwn-739b000994b7c813e4cac56c077abd8f6b0ccaab.tar.gz lwn-739b000994b7c813e4cac56c077abd8f6b0ccaab.zip | |
Merge branch 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux into drm-fixes
misc vmwgfx fixes.
* 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux:
drm/vmwgfx: constify pci_device_id.
drm/vmwgfx: Fix gcc-7.1.1 warning
drm/vmwgfx: Fix cursor hotspot issue with Wayland on Fedora
drm/vmwgfx: Limit max desktop dimensions to 8Kx8K
drm/vmwgfx: dma-buf: Constify ttm_place structures.
drm/vmwgfx: fix comment mistake for vmw_cmd_dx_set_index_buffer()
drm/vmwgfx: Use dma_pool_zalloc
drm/vmwgfx: Fix handling of errors returned by 'vmw_cotable_alloc()'
drm/vmwgfx: Fix NULL pointer comparison
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_kms.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 3d94ea67a825..61e06f0e8cd3 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -384,6 +384,12 @@ vmw_du_cursor_plane_atomic_update(struct drm_plane *plane, hotspot_x = du->hotspot_x; hotspot_y = du->hotspot_y; + + if (plane->fb) { + hotspot_x += plane->fb->hot_x; + hotspot_y += plane->fb->hot_y; + } + du->cursor_surface = vps->surf; du->cursor_dmabuf = vps->dmabuf; @@ -411,6 +417,9 @@ vmw_du_cursor_plane_atomic_update(struct drm_plane *plane, vmw_cursor_update_position(dev_priv, true, du->cursor_x + hotspot_x, du->cursor_y + hotspot_y); + + du->core_hotspot_x = hotspot_x - du->hotspot_x; + du->core_hotspot_y = hotspot_y - du->hotspot_y; } else { DRM_ERROR("Failed to update cursor image\n"); } |