summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-03-13 17:30:31 +1000
committerDave Airlie <airlied@redhat.com>2014-03-13 17:30:31 +1000
commit7aa4a0648e9bbbd1c2fd0d66db3ba6f358709445 (patch)
tree3007c1498b6a2cda02a58e2aded66187397dccb4
parentfa389e220254c69ffae0d403eac4146171062d08 (diff)
parent4b0c82529b92cda4723cf1d09e1e2ee9b9ae96f1 (diff)
downloadop-kernel-dev-7aa4a0648e9bbbd1c2fd0d66db3ba6f358709445.zip
op-kernel-dev-7aa4a0648e9bbbd1c2fd0d66db3ba6f358709445.tar.gz
Merge tag 'vmwgfx-fixes-3.14-2014-03-13' of git://people.freedesktop.org/~thomash/linux into drm-fixes
Pull request of 2014-03-13 one minor fix for new hw * tag 'vmwgfx-fixes-3.14-2014-03-13' of git://people.freedesktop.org/~thomash/linux: drm/vmwgfx: Fix a surface reference corner-case in legacy emulation mode
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_surface.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
index 82468d9..e7af580 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
@@ -830,6 +830,24 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
if (unlikely(ret != 0))
goto out_unlock;
+ /*
+ * A gb-aware client referencing a shared surface will
+ * expect a backup buffer to be present.
+ */
+ if (dev_priv->has_mob && req->shareable) {
+ uint32_t backup_handle;
+
+ ret = vmw_user_dmabuf_alloc(dev_priv, tfile,
+ res->backup_size,
+ true,
+ &backup_handle,
+ &res->backup);
+ if (unlikely(ret != 0)) {
+ vmw_resource_unreference(&res);
+ goto out_unlock;
+ }
+ }
+
tmp = vmw_resource_reference(&srf->res);
ret = ttm_prime_object_init(tfile, res->backup_size, &user_srf->prime,
req->shareable, VMW_RES_SURFACE,
OpenPOWER on IntegriCloud