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

Commit 11c45419 authored by Deepak Rawat's avatar Deepak Rawat
Browse files

drm/vmwgfx: Use preprocessor macro for FIFO allocation 



Whenever FIFO allocation fails an error message is printed to dmesg.
Since this is common operation a lot of similar messages are scattered
everywhere. Use preprocessor macro to remove this cluttering.

Signed-off-by: default avatarDeepak Rawat <drawat@vmware.com>
Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
parent 680360a4

drivers/gpu/drm/vmwgfx/vmwgfx_binding.c

+22 −50
Original line number Diff line number Diff line
@@ -499,12 +499,9 @@ static int vmw_binding_scrub_shader(struct vmw_ctx_bindinfo *bi, bool rebind) 
		SVGA3dCmdSetShader body;

	} *cmd;



	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for shader "

			  "unbinding.\n");

	cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_SET_SHADER;

	cmd->header.size = sizeof(cmd->body);
@@ -534,12 +531,9 @@ static int vmw_binding_scrub_render_target(struct vmw_ctx_bindinfo *bi, 
		SVGA3dCmdSetRenderTarget body;

	} *cmd;



	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for render target "

			  "unbinding.\n");

	cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_SETRENDERTARGET;

	cmd->header.size = sizeof(cmd->body);
@@ -576,12 +570,9 @@ static int vmw_binding_scrub_texture(struct vmw_ctx_bindinfo *bi, 
		} body;

	} *cmd;



	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for texture "

			  "unbinding.\n");

	cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_SETTEXTURESTATE;

	cmd->header.size = sizeof(cmd->body);
@@ -610,12 +601,10 @@ static int vmw_binding_scrub_dx_shader(struct vmw_ctx_bindinfo *bi, bool rebind) 
		SVGA3dCmdDXSetShader body;

	} *cmd;



	cmd = vmw_fifo_reserve_dx(dev_priv, sizeof(*cmd), bi->ctx->id);

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for DX shader "

			  "unbinding.\n");

	cmd = VMW_FIFO_RESERVE_DX(dev_priv, sizeof(*cmd), bi->ctx->id);

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_DX_SET_SHADER;

	cmd->header.size = sizeof(cmd->body);

	cmd->body.type = binding->shader_slot + SVGA3D_SHADERTYPE_MIN;
@@ -641,12 +630,9 @@ static int vmw_binding_scrub_cb(struct vmw_ctx_bindinfo *bi, bool rebind) 
		SVGA3dCmdDXSetSingleConstantBuffer body;

	} *cmd;



	cmd = vmw_fifo_reserve_dx(dev_priv, sizeof(*cmd), bi->ctx->id);

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for DX shader "

			  "unbinding.\n");

	cmd = VMW_FIFO_RESERVE_DX(dev_priv, sizeof(*cmd), bi->ctx->id);

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_DX_SET_SINGLE_CONSTANT_BUFFER;

	cmd->header.size = sizeof(cmd->body);
@@ -768,12 +754,9 @@ static int vmw_emit_set_sr(struct vmw_ctx_binding_state *cbs, 


	view_id_size = cbs->bind_cmd_count*sizeof(uint32);

	cmd_size = sizeof(*cmd) + view_id_size;

	cmd = vmw_fifo_reserve_dx(ctx->dev_priv, cmd_size, ctx->id);

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for DX shader"

			  " resource binding.\n");

	cmd = VMW_FIFO_RESERVE_DX(ctx->dev_priv, cmd_size, ctx->id);

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_DX_SET_SHADER_RESOURCES;

	cmd->header.size = sizeof(cmd->body) + view_id_size;
@@ -807,12 +790,9 @@ static int vmw_emit_set_rt(struct vmw_ctx_binding_state *cbs) 
	vmw_collect_view_ids(cbs, loc, SVGA3D_MAX_SIMULTANEOUS_RENDER_TARGETS);

	view_id_size = cbs->bind_cmd_count*sizeof(uint32);

	cmd_size = sizeof(*cmd) + view_id_size;

	cmd = vmw_fifo_reserve_dx(ctx->dev_priv, cmd_size, ctx->id);

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for DX render-target"

			  " binding.\n");

	cmd = VMW_FIFO_RESERVE_DX(ctx->dev_priv, cmd_size, ctx->id);

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_DX_SET_RENDERTARGETS;

	cmd->header.size = sizeof(cmd->body) + view_id_size;
@@ -894,12 +874,9 @@ static int vmw_emit_set_so(struct vmw_ctx_binding_state *cbs) 


	so_target_size = cbs->bind_cmd_count*sizeof(SVGA3dSoTarget);

	cmd_size = sizeof(*cmd) + so_target_size;

	cmd = vmw_fifo_reserve_dx(ctx->dev_priv, cmd_size, ctx->id);

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for DX SO target"

			  " binding.\n");

	cmd = VMW_FIFO_RESERVE_DX(ctx->dev_priv, cmd_size, ctx->id);

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_DX_SET_SOTARGETS;

	cmd->header.size = sizeof(cmd->body) + so_target_size;
@@ -1011,12 +988,9 @@ static int vmw_emit_set_vb(struct vmw_ctx_binding_state *cbs) 


	set_vb_size = cbs->bind_cmd_count*sizeof(SVGA3dVertexBuffer);

	cmd_size = sizeof(*cmd) + set_vb_size;

	cmd = vmw_fifo_reserve_dx(ctx->dev_priv, cmd_size, ctx->id);

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for DX vertex buffer"

			  " binding.\n");

	cmd = VMW_FIFO_RESERVE_DX(ctx->dev_priv, cmd_size, ctx->id);

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_DX_SET_VERTEX_BUFFERS;

	cmd->header.size = sizeof(cmd->body) + set_vb_size;
@@ -1167,12 +1141,10 @@ static int vmw_binding_scrub_ib(struct vmw_ctx_bindinfo *bi, bool rebind) 
		SVGA3dCmdDXSetIndexBuffer body;

	} *cmd;



	cmd = vmw_fifo_reserve_dx(dev_priv, sizeof(*cmd), bi->ctx->id);

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for DX index buffer "

			  "binding.\n");

	cmd = VMW_FIFO_RESERVE_DX(dev_priv, sizeof(*cmd), bi->ctx->id);

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_DX_SET_INDEX_BUFFER;

	cmd->header.size = sizeof(cmd->body);

	if (rebind) {

drivers/gpu/drm/vmwgfx/vmwgfx_context.c

+16 −39
Original line number Diff line number Diff line
@@ -156,12 +156,9 @@ static void vmw_hw_context_destroy(struct vmw_resource *res) 
	}



	vmw_execbuf_release_pinned_bo(dev_priv);

	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for surface "

			  "destruction.\n");

	cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL))

		return;

	}



	cmd->header.id = SVGA_3D_CMD_CONTEXT_DESTROY;

	cmd->header.size = sizeof(cmd->body);
@@ -259,9 +256,8 @@ static int vmw_context_init(struct vmw_private *dev_priv, 
		return -ENOMEM;

	}



	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Fifo reserve failed.\n");

		vmw_resource_unreference(&res);

		return -ENOMEM;

	}
@@ -311,10 +307,8 @@ static int vmw_gb_context_create(struct vmw_resource *res) 
		goto out_no_fifo;

	}



	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for context "

			  "creation.\n");

		ret = -ENOMEM;

		goto out_no_fifo;

	}
@@ -345,12 +339,10 @@ static int vmw_gb_context_bind(struct vmw_resource *res, 


	BUG_ON(bo->mem.mem_type != VMW_PL_MOB);



	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for context "

			  "binding.\n");

	cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_BIND_GB_CONTEXT;

	cmd->header.size = sizeof(cmd->body);

	cmd->body.cid = res->id;
@@ -391,10 +383,8 @@ static int vmw_gb_context_unbind(struct vmw_resource *res, 


	submit_size = sizeof(*cmd2) + (readback ? sizeof(*cmd1) : 0);



	cmd = vmw_fifo_reserve(dev_priv, submit_size);

	cmd = VMW_FIFO_RESERVE(dev_priv, submit_size);

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for context "

			  "unbinding.\n");

		mutex_unlock(&dev_priv->binding_mutex);

		return -ENOMEM;

	}
@@ -441,12 +431,9 @@ static int vmw_gb_context_destroy(struct vmw_resource *res) 
	if (likely(res->id == -1))

		return 0;



	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for context "

			  "destruction.\n");

	cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_DESTROY_GB_CONTEXT;

	cmd->header.size = sizeof(cmd->body);
@@ -487,10 +474,8 @@ static int vmw_dx_context_create(struct vmw_resource *res) 
		goto out_no_fifo;

	}



	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for context "

			  "creation.\n");

		ret = -ENOMEM;

		goto out_no_fifo;

	}
@@ -521,12 +506,9 @@ static int vmw_dx_context_bind(struct vmw_resource *res, 


	BUG_ON(bo->mem.mem_type != VMW_PL_MOB);



	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for context "

			  "binding.\n");

	cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_DX_BIND_CONTEXT;

	cmd->header.size = sizeof(cmd->body);
@@ -615,10 +597,8 @@ static int vmw_dx_context_unbind(struct vmw_resource *res, 


	submit_size = sizeof(*cmd2) + (readback ? sizeof(*cmd1) : 0);



	cmd = vmw_fifo_reserve(dev_priv, submit_size);

	cmd = VMW_FIFO_RESERVE(dev_priv, submit_size);

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for context "

			  "unbinding.\n");

		mutex_unlock(&dev_priv->binding_mutex);

		return -ENOMEM;

	}
@@ -665,12 +645,9 @@ static int vmw_dx_context_destroy(struct vmw_resource *res) 
	if (likely(res->id == -1))

		return 0;



	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed reserving FIFO space for context "

			  "destruction.\n");

	cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL))

		return -ENOMEM;

	}



	cmd->header.id = SVGA_3D_CMD_DX_DESTROY_CONTEXT;

	cmd->header.size = sizeof(cmd->body);

drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c

+7 −16
Original line number Diff line number Diff line
@@ -171,12 +171,9 @@ static int vmw_cotable_unscrub(struct vmw_resource *res) 
	WARN_ON_ONCE(bo->mem.mem_type != VMW_PL_MOB);

	lockdep_assert_held(&bo->resv->lock.base);



	cmd = vmw_fifo_reserve_dx(dev_priv, sizeof(*cmd), SVGA3D_INVALID_ID);

	if (!cmd) {

		DRM_ERROR("Failed reserving FIFO space for cotable "

			  "binding.\n");

	cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

	if (!cmd)

		return -ENOMEM;

	}



	WARN_ON(vcotbl->ctx->id == SVGA3D_INVALID_ID);

	WARN_ON(bo->mem.mem_type != VMW_PL_MOB);
@@ -262,12 +259,9 @@ int vmw_cotable_scrub(struct vmw_resource *res, bool readback) 
	if (readback)

		submit_size += sizeof(*cmd0);



	cmd1 = vmw_fifo_reserve_dx(dev_priv, submit_size, SVGA3D_INVALID_ID);

	if (!cmd1) {

		DRM_ERROR("Failed reserving FIFO space for cotable "

			  "unbinding.\n");

	cmd1 = VMW_FIFO_RESERVE(dev_priv, submit_size);

	if (!cmd1)

		return -ENOMEM;

	}



	vcotbl->size_read_back = 0;

	if (readback) {
@@ -351,13 +345,10 @@ static int vmw_cotable_readback(struct vmw_resource *res) 
	struct vmw_fence_obj *fence;



	if (!vcotbl->scrubbed) {

		cmd = vmw_fifo_reserve_dx(dev_priv, sizeof(*cmd),

					  SVGA3D_INVALID_ID);

		if (!cmd) {

			DRM_ERROR("Failed reserving FIFO space for cotable "

				  "readback.\n");

		cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd));

		if (!cmd)

			return -ENOMEM;

		}



		cmd->header.id = SVGA_3D_CMD_DX_READBACK_COTABLE;

		cmd->header.size = sizeof(cmd->body);

		cmd->body.cid = vcotbl->ctx->id;

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+12 −1
Original line number Diff line number Diff line
@@ -813,7 +813,6 @@ extern int vmw_fifo_init(struct vmw_private *dev_priv, 
			 struct vmw_fifo_state *fifo);

extern void vmw_fifo_release(struct vmw_private *dev_priv,

			     struct vmw_fifo_state *fifo);

extern void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes);

extern void *

vmw_fifo_reserve_dx(struct vmw_private *dev_priv, uint32_t bytes, int ctx_id);

extern void vmw_fifo_commit(struct vmw_private *dev_priv, uint32_t bytes);
@@ -829,6 +828,18 @@ extern int vmw_fifo_emit_dummy_query(struct vmw_private *dev_priv, 
extern int vmw_fifo_flush(struct vmw_private *dev_priv,

			  bool interruptible);



#define VMW_FIFO_RESERVE_DX(__priv, __bytes, __ctx_id)                        \

({                                                                            \

	vmw_fifo_reserve_dx(__priv, __bytes, __ctx_id) ? : ({                 \

		DRM_ERROR("FIFO reserve failed at %s for %u bytes\n",         \

			  __func__, (unsigned int) __bytes);                  \

		NULL;                                                         \

	});                                                                   \

})



#define VMW_FIFO_RESERVE(__priv, __bytes)                                     \

	VMW_FIFO_RESERVE_DX(__priv, __bytes, SVGA3D_INVALID_ID)



/**

 * TTM glue - vmwgfx_ttm_glue.c

 */

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

+5 −7
Original line number Diff line number Diff line
@@ -720,8 +720,7 @@ static int vmw_rebind_all_dx_query(struct vmw_resource *ctx_res) 
	if (!dx_query_mob || dx_query_mob->dx_query_ctx)

		return 0;



	cmd = vmw_fifo_reserve_dx(dev_priv, sizeof(*cmd), ctx_res->id);



	cmd = VMW_FIFO_RESERVE_DX(dev_priv, sizeof(*cmd), ctx_res->id);

	if (cmd == NULL)

		return -ENOMEM;
@@ -3468,14 +3467,13 @@ static int vmw_execbuf_submit_fifo(struct vmw_private *dev_priv, 
	void *cmd;



	if (sw_context->dx_ctx_node)

		cmd = vmw_fifo_reserve_dx(dev_priv, command_size,

		cmd = VMW_FIFO_RESERVE_DX(dev_priv, command_size,

					  sw_context->dx_ctx_node->ctx->id);

	else

		cmd = vmw_fifo_reserve(dev_priv, command_size);

	if (!cmd) {

		VMW_DEBUG_USER("Failed reserving fifo space for commands.\n");

		cmd = VMW_FIFO_RESERVE(dev_priv, command_size);



	if (!cmd)

		return -ENOMEM;

	}



	vmw_apply_relocations(sw_context);

	memcpy(cmd, kernel_commands, command_size);