diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-21 09:50:56 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-21 09:50:56 +0000 |
| commit | 4cf73129cbe001b41be2f8b56f763fbf3acaa4ce (patch) | |
| tree | 2cdde82f48800ae1746775bab7e4f3c5f1fc3b88 /drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | |
| parent | 3e54f5b72b44a5b905dc56442b147b0ee0475a1d (diff) | |
| parent | 6abff3c78051e40130a1c653f874fb12b9d40254 (diff) | |
| download | op-kernel-dev-4cf73129cbe001b41be2f8b56f763fbf3acaa4ce.zip op-kernel-dev-4cf73129cbe001b41be2f8b56f763fbf3acaa4ce.tar.gz | |
Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next
-next reported a messy merge, so I've merged my upstream pull into
my -next tree.
Conflicts:
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_kms.h')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h index 055b844..a4f7f03 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h @@ -63,9 +63,14 @@ struct vmw_framebuffer { int vmw_cursor_update_image(struct vmw_private *dev_priv, u32 *image, u32 width, u32 height, u32 hotspotX, u32 hotspotY); +int vmw_cursor_update_dmabuf(struct vmw_private *dev_priv, + struct vmw_dma_buffer *dmabuf, + u32 width, u32 height, + u32 hotspotX, u32 hotspotY); void vmw_cursor_update_position(struct vmw_private *dev_priv, bool show, int x, int y); + /** * Base class display unit. * |
