Commit a26ca967 authored by Lukas Bulwahn's avatar Lukas Bulwahn Committed by Thomas Hellstrom
Browse files

drm/vmwgfx: Replace deprecated PTR_RET 



Commit 508108ea ("drm/vmwgfx: Don't refcount command-buffer managed
resource lookups during command buffer validation") slips in use of
deprecated PTR_RET. Use PTR_ERR_OR_ZERO instead.

As the PTR_ERR_OR_ZERO is a bit longer than PTR_RET, we introduce
local variable ret for proper indentation and line-length limits.

Signed-off-by: default avatarLukas Bulwahn <lukas.bulwahn@gmail.com>
Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
parent 36891da8

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

+15 −6
Original line number Diff line number Diff line
@@ -2377,9 +2377,12 @@ static int vmw_cmd_dx_clear_rendertarget_view(struct vmw_private *dev_priv, 
{

	VMW_DECLARE_CMD_VAR(*cmd, SVGA3dCmdDXClearRenderTargetView) =

		container_of(header, typeof(*cmd), header);

	struct vmw_resource *ret;



	return PTR_RET(vmw_view_id_val_add(sw_context, vmw_view_rt,

					   cmd->body.renderTargetViewId));

	ret = vmw_view_id_val_add(sw_context, vmw_view_rt,

				  cmd->body.renderTargetViewId);



	return PTR_ERR_OR_ZERO(ret);

}



/**
@@ -2396,9 +2399,12 @@ static int vmw_cmd_dx_clear_depthstencil_view(struct vmw_private *dev_priv, 
{

	VMW_DECLARE_CMD_VAR(*cmd, SVGA3dCmdDXClearDepthStencilView) =

		container_of(header, typeof(*cmd), header);

	struct vmw_resource *ret;



	ret = vmw_view_id_val_add(sw_context, vmw_view_ds,

				  cmd->body.depthStencilViewId);



	return PTR_RET(vmw_view_id_val_add(sw_context, vmw_view_ds,

					   cmd->body.depthStencilViewId));

	return PTR_ERR_OR_ZERO(ret);

}



static int vmw_cmd_dx_view_define(struct vmw_private *dev_priv,
@@ -2741,9 +2747,12 @@ static int vmw_cmd_dx_genmips(struct vmw_private *dev_priv, 
{

	VMW_DECLARE_CMD_VAR(*cmd, SVGA3dCmdDXGenMips) =

		container_of(header, typeof(*cmd), header);

	struct vmw_resource *ret;



	ret = vmw_view_id_val_add(sw_context, vmw_view_sr,

				  cmd->body.shaderResourceViewId);



	return PTR_RET(vmw_view_id_val_add(sw_context, vmw_view_sr,

					   cmd->body.shaderResourceViewId));

	return PTR_ERR_OR_ZERO(ret);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE