diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-09 12:06:07 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-09 12:06:07 +0200 |
| commit | b8c511a4fbac3db36f26936d6cc710ca6df0a721 (patch) | |
| tree | acdd1bb883344e0ef06601b380604a7a07bf0129 /drivers/gpu/drm/qxl/qxl_drv.c | |
| parent | 5c9f5549156737539a4b2a5b6d3e44b52c0f4e64 (diff) | |
| parent | 3c85f20a289d044f303f473ee6ab7502303fc3b0 (diff) | |
Merge remote-tracking branch 'drm-upstream/drm-next' into drm-intel-nightly
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_drv.c')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index dc9df5fe50ba..460bbceae297 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -256,7 +256,7 @@ static struct drm_driver qxl_driver = { .gem_prime_vmap = qxl_gem_prime_vmap, .gem_prime_vunmap = qxl_gem_prime_vunmap, .gem_prime_mmap = qxl_gem_prime_mmap, - .gem_free_object = qxl_gem_object_free, + .gem_free_object_unlocked = qxl_gem_object_free, .gem_open_object = qxl_gem_object_open, .gem_close_object = qxl_gem_object_close, .fops = &qxl_fops, |