drm/vmwgfx: Fix an incorrect OOM return value
Subsystems (3)
PATCH 1/2 drm/vmwgfx: Fix an incorrect OOM return value
At the same time, make error paths return early for clarity.
Signed-off-by Thomas Hellstrom <[email protected]>
Reported-by Dan Carpenter <[email protected]>
Reviewed-by jakob Bornecrantz <[email protected]>
Cc <[email protected]>
--- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +5 -6
@@ -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 ; }
Signature · 1 line
1.8.3.2
PATCH 2/2 drm/vmwgfx: Fix a potential infinite spin waiting for fifo idle
The code waiting for fifo idle was incorrect and could possibly spin forever under certain circumstances.
Signed-off-by Thomas Hellstrom <[email protected]>
Reported-by Mark Sheldon <[email protected]>
Reviewed-by Jakob Bornecrantz <[email protected]>
Reivewed-by Mark Sheldon <[email protected]>
Cc <[email protected]>
--- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +2 -1
@@ -180,8 +180,9 @@ void vmw_fifo_release(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)mutex_lock (&dev_priv->hw_mutex); +vmw_write (dev_priv,SVGA_REG_SYNC ,SVGA_SYNC_GENERIC );while (vmw_read (dev_priv,SVGA_REG_BUSY ) !=0 ) -vmw_write (dev_priv,SVGA_REG_SYNC ,SVGA_SYNC_GENERIC ); + ; dev_priv->last_read_seqno =ioread32 (fifo_mem +SVGA_FIFO_FENCE );
Signature · 1 line
1.8.3.2