Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aa4a064 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'vmwgfx-fixes-3.14-2014-03-13' of... 

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
parents fa389e22 4b0c8252

drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

+18 −0
Original line number Diff line number Diff line
@@ -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,