* [PATCH] fbdev: Make pixel_to_pat() failure mode more friendly
@ 2012-07-24 8:19 Benjamin Herrenschmidt
2012-07-29 21:16 ` Florian Tobias Schandinat
0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2012-07-24 8:19 UTC (permalink / raw)
To: linux-fbdev
If we accidentally pass an incorrect bpp value to pixel_to_pat(),
it panics. This is pretty useless, as we generally have the various
console locks held at that point, so nothing will be displayed,
and there is no reason to make this a fatal event.
Let's WARN instead.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
diff --git a/drivers/video/fb_draw.h b/drivers/video/fb_draw.h
index 04c01fa..624ee11 100644
--- a/drivers/video/fb_draw.h
+++ b/drivers/video/fb_draw.h
@@ -3,6 +3,7 @@
#include <asm/types.h>
#include <linux/fb.h>
+#include <linux/bug.h>
/*
* Compose two values, using a bitmask as decision value
@@ -41,7 +42,8 @@ pixel_to_pat( u32 bpp, u32 pixel)
case 32:
return 0x0000000100000001ul*pixel;
default:
- panic("pixel_to_pat(): unsupported pixelformat\n");
+ WARN(1, "pixel_to_pat(): unsupported pixelformat %d\n", bpp);
+ return 0;
}
}
#else
@@ -66,7 +68,8 @@ pixel_to_pat( u32 bpp, u32 pixel)
case 32:
return 0x00000001ul*pixel;
default:
- panic("pixel_to_pat(): unsupported pixelformat\n");
+ WARN(1, "pixel_to_pat(): unsupported pixelformat %d\n", bpp);
+ return 0;
}
}
#endif
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] fbdev: Make pixel_to_pat() failure mode more friendly
2012-07-24 8:19 [PATCH] fbdev: Make pixel_to_pat() failure mode more friendly Benjamin Herrenschmidt
@ 2012-07-29 21:16 ` Florian Tobias Schandinat
0 siblings, 0 replies; 2+ messages in thread
From: Florian Tobias Schandinat @ 2012-07-29 21:16 UTC (permalink / raw)
To: linux-fbdev
On 07/24/2012 08:19 AM, Benjamin Herrenschmidt wrote:
> If we accidentally pass an incorrect bpp value to pixel_to_pat(),
> it panics. This is pretty useless, as we generally have the various
> console locks held at that point, so nothing will be displayed,
> and there is no reason to make this a fatal event.
>
> Let's WARN instead.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Applied.
Thanks,
Florian Tobias Schandinat
> ---
>
> diff --git a/drivers/video/fb_draw.h b/drivers/video/fb_draw.h
> index 04c01fa..624ee11 100644
> --- a/drivers/video/fb_draw.h
> +++ b/drivers/video/fb_draw.h
> @@ -3,6 +3,7 @@
>
> #include <asm/types.h>
> #include <linux/fb.h>
> +#include <linux/bug.h>
>
> /*
> * Compose two values, using a bitmask as decision value
> @@ -41,7 +42,8 @@ pixel_to_pat( u32 bpp, u32 pixel)
> case 32:
> return 0x0000000100000001ul*pixel;
> default:
> - panic("pixel_to_pat(): unsupported pixelformat\n");
> + WARN(1, "pixel_to_pat(): unsupported pixelformat %d\n", bpp);
> + return 0;
> }
> }
> #else
> @@ -66,7 +68,8 @@ pixel_to_pat( u32 bpp, u32 pixel)
> case 32:
> return 0x00000001ul*pixel;
> default:
> - panic("pixel_to_pat(): unsupported pixelformat\n");
> + WARN(1, "pixel_to_pat(): unsupported pixelformat %d\n", bpp);
> + return 0;
> }
> }
> #endif
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-29 21:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-24 8:19 [PATCH] fbdev: Make pixel_to_pat() failure mode more friendly Benjamin Herrenschmidt
2012-07-29 21:16 ` Florian Tobias Schandinat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).