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/vmwgfx/vmwgfx_kms.c | |
| parent | d2989b534ef6834ebf2425aecc040b894b567c91 (diff) | |
| parent | 7c6ca3040e9ac174e6d2189811da603e9c19a150 (diff) | |
| download | talos-op-linux-06d5a24f08831e167fae42a64ef2083a89f8e617.tar.gz talos-op-linux-06d5a24f08831e167fae42a64ef2083a89f8e617.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-nouveau-next
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_kms.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 3e3c7ab33ca2..d4607b2530d6 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -174,7 +174,6 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, uint32_t handle, uint32_t width, uint32_t height) { struct vmw_private *dev_priv = vmw_priv(crtc->dev); - struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile; struct vmw_display_unit *du = vmw_crtc_to_du(crtc); struct vmw_surface *surface = NULL; struct vmw_dma_buffer *dmabuf = NULL; @@ -197,6 +196,8 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, } if (handle) { + struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile; + ret = vmw_user_lookup_handle(dev_priv, tfile, handle, &surface, &dmabuf); if (ret) { |
