diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2020-06-25 18:05:03 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-06-25 18:05:03 +0300 |
| commit | 0f69403d2535ffc7200a8414cf3ca66a49b0d741 (patch) | |
| tree | 3ce85dd08359ea872aa8fb9bd12072efdb80a787 /drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | |
| parent | 580fbdc5136822208f107500682e50a1cb232e94 (diff) | |
| parent | 0a19b068acc47d05212f03e494381926dc0381e2 (diff) | |
| download | lwn-0f69403d2535ffc7200a8414cf3ca66a49b0d741.tar.gz lwn-0f69403d2535ffc7200a8414cf3ca66a49b0d741.zip | |
Merge drm/drm-next into drm-intel-next-queued
Catch up with upstream, in particular to get c1e8d7c6a7a6 ("mmap locking
API: convert mmap_sem comments").
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_surface.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c index 7ef51fa84b01..126f93c0b0b8 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c @@ -1651,7 +1651,7 @@ vmw_gb_surface_reference_internal(struct drm_device *dev, struct vmw_surface_metadata *metadata; struct ttm_base_object *base; uint32_t backup_handle; - int ret = -EINVAL; + int ret; ret = vmw_surface_handle_reference(dev_priv, file_priv, req->sid, req->handle_type, &base); |