diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-07-08 13:40:34 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-07-08 13:40:34 +1000 |
| commit | 06d5a24f08831e167fae42a64ef2083a89f8e617 (patch) | |
| tree | 509ef5096fcf1b32029b912afba9a2c1ce9067d9 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | d2989b534ef6834ebf2425aecc040b894b567c91 (diff) | |
| parent | 7c6ca3040e9ac174e6d2189811da603e9c19a150 (diff) | |
Merge remote-tracking branch 'airlied/drm-next' into drm-nouveau-next
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 383f4e6ea9d1..218a4b522fe5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -702,6 +702,7 @@ driver = { .gem_prime_export = drm_gem_prime_export, .gem_prime_import = drm_gem_prime_import, .gem_prime_pin = nouveau_gem_prime_pin, + .gem_prime_unpin = nouveau_gem_prime_unpin, .gem_prime_get_sg_table = nouveau_gem_prime_get_sg_table, .gem_prime_import_sg_table = nouveau_gem_prime_import_sg_table, .gem_prime_vmap = nouveau_gem_prime_vmap, |