Merge tag 'soc-fsl-fix-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/leo...

[linux-2.6-microblaze.git] / drivers / gpu / drm / vmwgfx / vmwgfx_fifo.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
index d0fd147..ff3586c 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
@@ -395,12 +395,8 @@ void *vmw_fifo_reserve_dx(struct vmw_private *dev_priv, uint32_t bytes,
                WARN(1, "Command buffer has not been allocated.\n");
                ret = NULL;
        }
-       if (IS_ERR_OR_NULL(ret)) {
-               DRM_ERROR("Fifo reserve failure of %u bytes.\n",
-                         (unsigned) bytes);
-               dump_stack();
+       if (IS_ERR_OR_NULL(ret))
                return NULL;
-       }
 
        return ret;
 }
@@ -544,7 +540,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
        int ret = 0;
        uint32_t bytes = sizeof(u32) + sizeof(*cmd_fence);
 
-       fm = vmw_fifo_reserve(dev_priv, bytes);
+       fm = VMW_FIFO_RESERVE(dev_priv, bytes);
        if (unlikely(fm == NULL)) {
                *seqno = atomic_read(&dev_priv->marker_seq);
                ret = -ENOMEM;
@@ -603,12 +599,9 @@ static int vmw_fifo_emit_dummy_legacy_query(struct vmw_private *dev_priv,
                SVGA3dCmdWaitForQuery body;
        } *cmd;
 
-       cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));
-
-       if (unlikely(cmd == NULL)) {
-               DRM_ERROR("Out of fifo space for dummy query.\n");
+       cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));
+       if (unlikely(cmd == NULL))
                return -ENOMEM;
-       }
 
        cmd->header.id = SVGA_3D_CMD_WAIT_FOR_QUERY;
        cmd->header.size = sizeof(cmd->body);
@@ -652,12 +645,9 @@ static int vmw_fifo_emit_dummy_gb_query(struct vmw_private *dev_priv,
                SVGA3dCmdWaitForGBQuery body;
        } *cmd;
 
-       cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));
-
-       if (unlikely(cmd == NULL)) {
-               DRM_ERROR("Out of fifo space for dummy query.\n");
+       cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));
+       if (unlikely(cmd == NULL))
                return -ENOMEM;
-       }
 
        cmd->header.id = SVGA_3D_CMD_WAIT_FOR_GB_QUERY;
        cmd->header.size = sizeof(cmd->body);
@@ -699,8 +689,3 @@ int vmw_fifo_emit_dummy_query(struct vmw_private *dev_priv,
 
        return vmw_fifo_emit_dummy_legacy_query(dev_priv, cid);
 }
-
-void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
-{
-       return vmw_fifo_reserve_dx(dev_priv, bytes, SVGA3D_INVALID_ID);
-}