summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Nizette <bn@niasdigital.com>2009-06-16 15:34:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 19:47:58 -0700
commit97b9a5a28b5fd02ceb3fcccee05e39dd62e4f474 (patch)
tree4f015ebdf8662960a115d666fe0d9ba65de0fb3e
parent4113819eb360555a91a8291f37bbbe9d26c5b275 (diff)
downloadlinux-3.10-97b9a5a28b5fd02ceb3fcccee05e39dd62e4f474.tar.gz
linux-3.10-97b9a5a28b5fd02ceb3fcccee05e39dd62e4f474.tar.bz2
linux-3.10-97b9a5a28b5fd02ceb3fcccee05e39dd62e4f474.zip
atmel-lcdc: fix pixclock upper bound detection
AFAICT the code which checks that the requested pixclock value is within bounds is incorrect. It ensures that the lcdc core clock is at least (bytes per pixel) times higher than the pixel clock rather than just greater than or equal to. There are tighter restrictions on the pixclock value as a function of bus width for STN panels but even then it isn't a simple relationship as currently checked for. IMO either something like the below patch should be applied or else more detailed checking logic should be implemented which takes in to account the panel type as well. Signed-off-by: Ben Nizette <bn@niasdigital.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Cc: Daniel Glockner <dg@emlix.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/atmel_lcdfb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 2fb63f6ea2f..5afd64482f5 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -345,7 +345,7 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
dev_dbg(dev, " bpp: %u\n", var->bits_per_pixel);
dev_dbg(dev, " clk: %lu KHz\n", clk_value_khz);
- if ((PICOS2KHZ(var->pixclock) * var->bits_per_pixel / 8) > clk_value_khz) {
+ if (PICOS2KHZ(var->pixclock) > clk_value_khz) {
dev_err(dev, "%lu KHz pixel clock is too fast\n", PICOS2KHZ(var->pixclock));
return -EINVAL;
}