diff options
author | Dave Airlie <airlied@redhat.com> | 2015-06-16 01:41:56 -0400 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-10-16 04:44:03 -0400 |
commit | f3380a3015541f13c25c980011c046e7114dff3d (patch) | |
tree | e0e87caef28f106de3f4c0a0b9e503fb840b67a1 | |
parent | 11a8f2805d4fd8a9c340b3f1b77990fd69b2dc0c (diff) |
virtio-gpu: mark as a render gpu
Also add DRM_RENDER_ALLOW to the ioctls.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_ioctl.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index 1f15ef8f2356..b40ed6061f05 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c | |||
@@ -118,7 +118,7 @@ static const struct file_operations virtio_gpu_driver_fops = { | |||
118 | 118 | ||
119 | 119 | ||
120 | static struct drm_driver driver = { | 120 | static struct drm_driver driver = { |
121 | .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME, | 121 | .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER, |
122 | .set_busid = drm_virtio_set_busid, | 122 | .set_busid = drm_virtio_set_busid, |
123 | .load = virtio_gpu_driver_load, | 123 | .load = virtio_gpu_driver_load, |
124 | .unload = virtio_gpu_driver_unload, | 124 | .unload = virtio_gpu_driver_unload, |
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c index 4ef672b314c6..b4de18e65db8 100644 --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c | |||
@@ -541,33 +541,33 @@ copy_exit: | |||
541 | 541 | ||
542 | struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS] = { | 542 | struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS] = { |
543 | DRM_IOCTL_DEF_DRV(VIRTGPU_MAP, virtio_gpu_map_ioctl, | 543 | DRM_IOCTL_DEF_DRV(VIRTGPU_MAP, virtio_gpu_map_ioctl, |
544 | DRM_AUTH|DRM_UNLOCKED), | 544 | DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW), |
545 | 545 | ||
546 | DRM_IOCTL_DEF_DRV(VIRTGPU_EXECBUFFER, virtio_gpu_execbuffer_ioctl, | 546 | DRM_IOCTL_DEF_DRV(VIRTGPU_EXECBUFFER, virtio_gpu_execbuffer_ioctl, |
547 | DRM_AUTH|DRM_UNLOCKED), | 547 | DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW), |
548 | 548 | ||
549 | DRM_IOCTL_DEF_DRV(VIRTGPU_GETPARAM, virtio_gpu_getparam_ioctl, | 549 | DRM_IOCTL_DEF_DRV(VIRTGPU_GETPARAM, virtio_gpu_getparam_ioctl, |
550 | DRM_AUTH|DRM_UNLOCKED), | 550 | DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW), |
551 | 551 | ||
552 | DRM_IOCTL_DEF_DRV(VIRTGPU_RESOURCE_CREATE, | 552 | DRM_IOCTL_DEF_DRV(VIRTGPU_RESOURCE_CREATE, |
553 | virtio_gpu_resource_create_ioctl, | 553 | virtio_gpu_resource_create_ioctl, |
554 | DRM_AUTH|DRM_UNLOCKED), | 554 | DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW), |
555 | 555 | ||
556 | DRM_IOCTL_DEF_DRV(VIRTGPU_RESOURCE_INFO, virtio_gpu_resource_info_ioctl, | 556 | DRM_IOCTL_DEF_DRV(VIRTGPU_RESOURCE_INFO, virtio_gpu_resource_info_ioctl, |
557 | DRM_AUTH|DRM_UNLOCKED), | 557 | DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW), |
558 | 558 | ||
559 | /* make transfer async to the main ring? - no sure, can we | 559 | /* make transfer async to the main ring? - no sure, can we |
560 | thread these in the underlying GL */ | 560 | thread these in the underlying GL */ |
561 | DRM_IOCTL_DEF_DRV(VIRTGPU_TRANSFER_FROM_HOST, | 561 | DRM_IOCTL_DEF_DRV(VIRTGPU_TRANSFER_FROM_HOST, |
562 | virtio_gpu_transfer_from_host_ioctl, | 562 | virtio_gpu_transfer_from_host_ioctl, |
563 | DRM_AUTH|DRM_UNLOCKED), | 563 | DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW), |
564 | DRM_IOCTL_DEF_DRV(VIRTGPU_TRANSFER_TO_HOST, | 564 | DRM_IOCTL_DEF_DRV(VIRTGPU_TRANSFER_TO_HOST, |
565 | virtio_gpu_transfer_to_host_ioctl, | 565 | virtio_gpu_transfer_to_host_ioctl, |
566 | DRM_AUTH|DRM_UNLOCKED), | 566 | DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW), |
567 | 567 | ||
568 | DRM_IOCTL_DEF_DRV(VIRTGPU_WAIT, virtio_gpu_wait_ioctl, | 568 | DRM_IOCTL_DEF_DRV(VIRTGPU_WAIT, virtio_gpu_wait_ioctl, |
569 | DRM_AUTH|DRM_UNLOCKED), | 569 | DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW), |
570 | 570 | ||
571 | DRM_IOCTL_DEF_DRV(VIRTGPU_GET_CAPS, virtio_gpu_get_caps_ioctl, | 571 | DRM_IOCTL_DEF_DRV(VIRTGPU_GET_CAPS, virtio_gpu_get_caps_ioctl, |
572 | DRM_AUTH|DRM_UNLOCKED), | 572 | DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW), |
573 | }; | 573 | }; |