aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>2007-02-12 00:55:18 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 09:48:44 -0800
commit5c52cbeb7f27e1242e88f99f7f6486a16d5733c7 (patch)
treef9274651844822522f1885c951bacdaadd2e2eef
parent11227fd1922dc5dda691586852cfd220dd383f37 (diff)
[PATCH] fbdev modedb: allow refresh rates for named video modes
fbdev modedb: Take into account the specified refresh rates for video modes specified by name, so e.g. all of `720p', `720p@60', and `720p@50' work. Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Cc: James Simmons <jsimmons@infradead.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/modedb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 5df41f6f2b86..53427a734d4b 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -610,10 +610,8 @@ done:
diff = refresh;
best = -1;
for (i = 0; i < dbsize; i++) {
- if ((name_matches(db[i], name, namelen) &&
- !fb_try_mode(var, info, &db[i], bpp)))
- return 1;
- if (res_specified && res_matches(db[i], xres, yres)) {
+ if (name_matches(db[i], name, namelen) ||
+ (res_specified && res_matches(db[i], xres, yres))) {
if(!fb_try_mode(var, info, &db[i], bpp)) {
if(!refresh_specified || db[i].refresh == refresh)
return 1;

Privacy Policy