* [PATCH 1/7] drm/msm/mdp: fix a problematic usage of WARN_ON()
@ 2015-11-25 13:12 Geliang Tang
2015-11-25 13:12 ` [PATCH 2/7] drm/vmwgfx: " Geliang Tang
0 siblings, 1 reply; 4+ messages in thread
From: Geliang Tang @ 2015-11-25 13:12 UTC (permalink / raw)
To: David Airlie, Rob Clark, jilai wang; +Cc: Geliang Tang, dri-devel, linux-kernel
WARN_ON() takes a condition rather than a format string. This patch
converted WARN_ON() to WARN() instead.
Signed-off-by: Geliang Tang <geliangtang@163.com>
---
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
index 8a7f6e1..00f7ecc 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
@@ -157,7 +157,7 @@ static inline uint32_t mixercfg(uint32_t mixer_cfg, int mixer,
COND(mixer == 1, MDP4_LAYERMIXER_IN_CFG_PIPE6_MIXER1);
break;
default:
- WARN_ON("invalid pipe");
+ WARN(1, "invalid pipe");
break;
}
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/7] drm/vmwgfx: fix a problematic usage of WARN_ON()
2015-11-25 13:12 [PATCH 1/7] drm/msm/mdp: fix a problematic usage of WARN_ON() Geliang Tang
@ 2015-11-25 13:12 ` Geliang Tang
2015-11-25 15:50 ` Sinclair Yeh
2015-11-26 14:51 ` Thomas Hellstrom
0 siblings, 2 replies; 4+ messages in thread
From: Geliang Tang @ 2015-11-25 13:12 UTC (permalink / raw)
To: David Airlie, Thomas Hellstrom, Sinclair Yeh, Charmaine Lee
Cc: Geliang Tang, dri-devel, linux-kernel
WARN_ON() takes a condition rather than a format string. This patch
converted WARN_ON() to WARN() instead.
Signed-off-by: Geliang Tang <geliangtang@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)) {
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/7] drm/vmwgfx: fix a problematic usage of WARN_ON()
2015-11-25 13:12 ` [PATCH 2/7] drm/vmwgfx: " Geliang Tang
@ 2015-11-25 15:50 ` Sinclair Yeh
2015-11-26 14:51 ` Thomas Hellstrom
1 sibling, 0 replies; 4+ messages in thread
From: Sinclair Yeh @ 2015-11-25 15:50 UTC (permalink / raw)
To: Geliang Tang
Cc: David Airlie, Thomas Hellstrom, Charmaine Lee, dri-devel,
linux-kernel
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
On Wed, Nov 25, 2015 at 09:12:15PM +0800, 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@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)) {
> --
> 2.5.0
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/7] drm/vmwgfx: fix a problematic usage of WARN_ON()
2015-11-25 13:12 ` [PATCH 2/7] drm/vmwgfx: " Geliang Tang
2015-11-25 15:50 ` Sinclair Yeh
@ 2015-11-26 14:51 ` Thomas Hellstrom
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Hellstrom @ 2015-11-26 14:51 UTC (permalink / raw)
To: Geliang Tang, David Airlie, Sinclair Yeh, Charmaine Lee
Cc: dri-devel, linux-kernel
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@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)) {
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-11-26 14:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-25 13:12 [PATCH 1/7] drm/msm/mdp: fix a problematic usage of WARN_ON() Geliang Tang
2015-11-25 13:12 ` [PATCH 2/7] drm/vmwgfx: " Geliang Tang
2015-11-25 15:50 ` Sinclair Yeh
2015-11-26 14:51 ` Thomas Hellstrom
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox