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

Commit 0977f906 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'vmwgfx-fixes-3.17' of git://people.freedesktop.org/~thomash/linux into drm-fixes 

Two vmwgfx fixes, marked for stable as well

* 'vmwgfx-fixes-3.17' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix a potential infinite spin waiting for fifo idle
  drm/vmwgfx: Fix an incorrect OOM return value
parents 46712cc9 f01ea0c3

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

+5 −6
Original line number Diff line number Diff line
@@ -450,11 +450,11 @@ static int vmw_cmd_res_reloc_add(struct vmw_private *dev_priv, 
					  res,

					  id_loc - sw_context->buf_start);

	if (unlikely(ret != 0))

		goto out_err;

		return ret;



	ret = vmw_resource_val_add(sw_context, res, &node);

	if (unlikely(ret != 0))

		goto out_err;

		return ret;



	if (res_type == vmw_res_context && dev_priv->has_mob &&

	    node->first_usage) {
@@ -468,13 +468,13 @@ static int vmw_cmd_res_reloc_add(struct vmw_private *dev_priv, 


		ret = vmw_resource_context_res_add(dev_priv, sw_context, res);

		if (unlikely(ret != 0))

			goto out_err;

			return ret;

		node->staged_bindings =

			kzalloc(sizeof(*node->staged_bindings), GFP_KERNEL);

		if (node->staged_bindings == NULL) {

			DRM_ERROR("Failed to allocate context binding "

				  "information.\n");

			goto out_err;

			return -ENOMEM;

		}

		INIT_LIST_HEAD(&node->staged_bindings->list);

	}
@@ -482,8 +482,7 @@ static int vmw_cmd_res_reloc_add(struct vmw_private *dev_priv, 
	if (p_val)

		*p_val = node;



out_err:

	return ret;

	return 0;

}

drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c

+2 −1
Original line number Diff line number Diff line
@@ -180,8 +180,9 @@ void vmw_fifo_release(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo) 


	mutex_lock(&dev_priv->hw_mutex);



	while (vmw_read(dev_priv, SVGA_REG_BUSY) != 0)

	vmw_write(dev_priv, SVGA_REG_SYNC, SVGA_SYNC_GENERIC);

	while (vmw_read(dev_priv, SVGA_REG_BUSY) != 0)

		;



	dev_priv->last_read_seqno = ioread32(fifo_mem + SVGA_FIFO_FENCE);