[PATCH 2/7] drm/vmwgfx: fix a problematic usage of WARN_ON()

Thomas Hellstrom thellstrom at vmware.com
Thu Nov 26 06:51:22 PST 2015


Thanks for reporting!

This fix was already reported by Dan Carpenter and has already been
queued in vmwgfx-fixes-4.4

/Thomas


On 11/25/2015 02:12 PM, Geliang Tang wrote:
> WARN_ON() takes a condition rather than a format string. This patch
> converted WARN_ON() to WARN() instead.
>
> Signed-off-by: Geliang Tang <geliangtang at 163.com>
> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
> index a8baf5f..b6a0806 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
> @@ -390,7 +390,7 @@ void *vmw_fifo_reserve_dx(struct vmw_private *dev_priv, uint32_t bytes,
>  	else if (ctx_id == SVGA3D_INVALID_ID)
>  		ret = vmw_local_fifo_reserve(dev_priv, bytes);
>  	else {
> -		WARN_ON("Command buffer has not been allocated.\n");
> +		WARN(1, "Command buffer has not been allocated.\n");
>  		ret = NULL;
>  	}
>  	if (IS_ERR_OR_NULL(ret)) {



More information about the dri-devel mailing list