diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-05-20 08:32:11 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-05-20 08:32:11 -0700 |
| commit | f29f24b5568fd6169e0363c78f1a80db38d0e7e9 (patch) | |
| tree | 835abaf6e1bb95b9d388f4249f355618e9da1489 /drivers/gpu/drm/virtio/virtgpu_drv.c | |
| parent | 1ba12322e2f0934383f111a5e695702aaf46b812 (diff) | |
| parent | 34b1b8061de3215208db9accfe60cc3f5b40178f (diff) | |
| download | talos-op-linux-f29f24b5568fd6169e0363c78f1a80db38d0e7e9.tar.gz talos-op-linux-f29f24b5568fd6169e0363c78f1a80db38d0e7e9.zip | |
Merge branch 'fixes-dra7' into fixes
Diffstat (limited to 'drivers/gpu/drm/virtio/virtgpu_drv.c')
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_drv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index b996ac1d4fcc..c50868753132 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c @@ -205,10 +205,12 @@ static struct drm_driver driver = { #if defined(CONFIG_DEBUG_FS) .debugfs_init = virtio_gpu_debugfs_init, #endif + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = drm_gem_prime_export, .gem_prime_import = drm_gem_prime_import, - .gem_prime_pin = virtgpu_gem_prime_pin, - .gem_prime_unpin = virtgpu_gem_prime_unpin, + .gem_prime_get_sg_table = virtgpu_gem_prime_get_sg_table, + .gem_prime_import_sg_table = virtgpu_gem_prime_import_sg_table, .gem_prime_vmap = virtgpu_gem_prime_vmap, .gem_prime_vunmap = virtgpu_gem_prime_vunmap, .gem_prime_mmap = virtgpu_gem_prime_mmap, |
