diff options
author | Jakob Bornecrantz <jakob@vmware.com> | 2011-10-04 14:13:26 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-10-05 05:17:17 -0400 |
commit | 2fcd5a73bfd5341876f9ea6b5adcc1dd814226d4 (patch) | |
tree | 88aa55c24bc1fe620a0753ab1598fe2727b19352 /drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |
parent | 44031d25ccface0ae647d664347ae3d3a8016f5f (diff) |
vmwgfx: Add present and readback ioctls
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.c')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 73757c3db8eb..ace4402214c6 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -94,6 +94,12 @@ | |||
94 | #define DRM_IOCTL_VMW_FENCE_UNREF \ | 94 | #define DRM_IOCTL_VMW_FENCE_UNREF \ |
95 | DRM_IOW(DRM_COMMAND_BASE + DRM_VMW_FENCE_UNREF, \ | 95 | DRM_IOW(DRM_COMMAND_BASE + DRM_VMW_FENCE_UNREF, \ |
96 | struct drm_vmw_fence_arg) | 96 | struct drm_vmw_fence_arg) |
97 | #define DRM_IOCTL_VMW_PRESENT \ | ||
98 | DRM_IOW(DRM_COMMAND_BASE + DRM_VMW_PRESENT, \ | ||
99 | struct drm_vmw_present_arg) | ||
100 | #define DRM_IOCTL_VMW_PRESENT_READBACK \ | ||
101 | DRM_IOW(DRM_COMMAND_BASE + DRM_VMW_PRESENT_READBACK, \ | ||
102 | struct drm_vmw_present_readback_arg) | ||
97 | 103 | ||
98 | /** | 104 | /** |
99 | * The core DRM version of this macro doesn't account for | 105 | * The core DRM version of this macro doesn't account for |
@@ -146,6 +152,13 @@ static struct drm_ioctl_desc vmw_ioctls[] = { | |||
146 | DRM_AUTH | DRM_UNLOCKED), | 152 | DRM_AUTH | DRM_UNLOCKED), |
147 | VMW_IOCTL_DEF(VMW_GET_3D_CAP, vmw_get_cap_3d_ioctl, | 153 | VMW_IOCTL_DEF(VMW_GET_3D_CAP, vmw_get_cap_3d_ioctl, |
148 | DRM_AUTH | DRM_UNLOCKED), | 154 | DRM_AUTH | DRM_UNLOCKED), |
155 | |||
156 | /* these allow direct access to the framebuffers mark as master only */ | ||
157 | VMW_IOCTL_DEF(VMW_PRESENT, vmw_present_ioctl, | ||
158 | DRM_MASTER | DRM_AUTH | DRM_UNLOCKED), | ||
159 | VMW_IOCTL_DEF(VMW_PRESENT_READBACK, | ||
160 | vmw_present_readback_ioctl, | ||
161 | DRM_MASTER | DRM_AUTH | DRM_UNLOCKED), | ||
149 | }; | 162 | }; |
150 | 163 | ||
151 | static struct pci_device_id vmw_pci_id_list[] = { | 164 | static struct pci_device_id vmw_pci_id_list[] = { |