aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>2007-10-16 04:29:44 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:21 -0400
commitce4c371a9de1f5b9e1d15f9d59c5f7d079bcd6d7 (patch)
treee1a5d3c0c8ce3656bdf7121ea8a8fbaad3140a88 /drivers/video
parent466c449e5feb6007841c100d385aeba7869b9946 (diff)
ps3av: dont distinguish between `boot' and `non-boot' autodetection
don't distinguish between `boot' and `non-boot' autodetection now the autodetection code has been improved Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/ps3fb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index c9037e984f8b..07fdad1604af 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -548,7 +548,6 @@ static int ps3fb_set_par(struct fb_info *info)
548 unsigned int mode; 548 unsigned int mode;
549 int i; 549 int i;
550 unsigned long offset; 550 unsigned long offset;
551 static int first = 1;
552 551
553 DPRINTK("xres:%d xv:%d yres:%d yv:%d clock:%d\n", 552 DPRINTK("xres:%d xv:%d yres:%d yv:%d clock:%d\n",
554 info->var.xres, info->var.xres_virtual, 553 info->var.xres, info->var.xres_virtual,
@@ -572,10 +571,9 @@ static int ps3fb_set_par(struct fb_info *info)
572 /* Keep the special bits we cannot set using fb_var_screeninfo */ 571 /* Keep the special bits we cannot set using fb_var_screeninfo */
573 ps3fb_mode = (ps3fb_mode & ~PS3AV_MODE_MASK) | mode; 572 ps3fb_mode = (ps3fb_mode & ~PS3AV_MODE_MASK) | mode;
574 573
575 if (ps3av_set_video_mode(ps3fb_mode, first)) 574 if (ps3av_set_video_mode(ps3fb_mode))
576 return -EINVAL; 575 return -EINVAL;
577 576
578 first = 0;
579 return 0; 577 return 0;
580} 578}
581 579
@@ -737,7 +735,7 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd,
737 break; 735 break;
738 736
739 if (!(val & PS3AV_MODE_MASK)) { 737 if (!(val & PS3AV_MODE_MASK)) {
740 u32 id = ps3av_get_auto_mode(0); 738 u32 id = ps3av_get_auto_mode();
741 if (id > 0) 739 if (id > 0)
742 val = (val & ~PS3AV_MODE_MASK) | id; 740 val = (val & ~PS3AV_MODE_MASK) | id;
743 } 741 }