diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-06-09 12:14:24 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-06-09 12:14:24 +1000 |
| commit | 76c6dccf34413ca460372fde027bedcdc2f59f86 (patch) | |
| tree | 7900bfd4350d7fd81daad98a5c8a58860b7f8795 /include/drm/drm_crtc.h | |
| parent | 5b735940aa11113abd369e8b3a144c68b0ff5ffa (diff) | |
| parent | 0062795e30697b825387a795b9c1791cc28a0a72 (diff) | |
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 'include/drm/drm_crtc.h')
| -rw-r--r-- | include/drm/drm_crtc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 411be4f45506..451acbe89c2b 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -253,6 +253,8 @@ struct drm_framebuffer { int bits_per_pixel; int flags; uint32_t pixel_format; /* fourcc format */ + int hot_x; + int hot_y; struct list_head filp_head; }; |