summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_crtc.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-06-09 12:14:24 +1000
committerDave Airlie <airlied@redhat.com>2016-06-09 12:14:24 +1000
commit76c6dccf34413ca460372fde027bedcdc2f59f86 (patch)
tree7900bfd4350d7fd81daad98a5c8a58860b7f8795 /drivers/gpu/drm/drm_crtc.c
parent5b735940aa11113abd369e8b3a144c68b0ff5ffa (diff)
parent0062795e30697b825387a795b9c1791cc28a0a72 (diff)
downloadblackbird-obmc-linux-76c6dccf34413ca460372fde027bedcdc2f59f86.tar.gz
blackbird-obmc-linux-76c6dccf34413ca460372fde027bedcdc2f59f86.zip
Merge branch 'virtio-gpu-for-airlied' of git://git.kraxel.org/linux into drm-next
Virtio-gpu updates * 'virtio-gpu-for-airlied' of git://git.kraxel.org/linux: virtio-gpu: use src not crtc virtio-gpu: pick up hotspot from framebuffer add cursor hotspot to drm_framebuffer virtio-gpu: switch to atomic cursor interfaces virtio-gpu: add atomic_commit function virtio-gpu: fix output lookup
Diffstat (limited to 'drivers/gpu/drm/drm_crtc.c')
-rw-r--r--drivers/gpu/drm/drm_crtc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index da2f28ea5fad..a4e259524e11 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -2919,6 +2919,8 @@ static int drm_mode_cursor_universal(struct drm_crtc *crtc,
DRM_DEBUG_KMS("failed to wrap cursor buffer in drm framebuffer\n");
return PTR_ERR(fb);
}
+ fb->hot_x = req->hot_x;
+ fb->hot_y = req->hot_y;
} else {
fb = NULL;
}
OpenPOWER on IntegriCloud