aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/ps3fb.c
diff options
context:
space:
mode:
authorMasashi Kimoto <Masashi_Kimoto@hq.scei.sony.co.jp>2007-05-02 08:48:36 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-04 20:59:08 -0400
commit640729014e073e6e2de1f513b2856b81aa7d84e9 (patch)
tree218002daa9c062311b40d0f1110f029ca8d89e48 /drivers/video/ps3fb.c
parentfffe52e86b4ad5f8bdcb284c4ea6c87402967f3d (diff)
ps3: Make `ps3videomode -v 0 (auto mode) work again
ps3: Make `ps3videomode -v 0' (auto mode) work again Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/ps3fb.c')
-rw-r--r--drivers/video/ps3fb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index f7f228d1c2d9..9fe64829aa81 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -732,6 +732,11 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd,
732 if (copy_from_user(&val, argp, sizeof(val))) 732 if (copy_from_user(&val, argp, sizeof(val)))
733 break; 733 break;
734 734
735 if (!(val & PS3AV_MODE_MASK)) {
736 u32 id = ps3av_get_auto_mode(0);
737 if (id > 0)
738 val = (val & ~PS3AV_MODE_MASK) | id;
739 }
735 DPRINTK("PS3FB_IOCTL_SETMODE:%x\n", val); 740 DPRINTK("PS3FB_IOCTL_SETMODE:%x\n", val);
736 retval = -EINVAL; 741 retval = -EINVAL;
737 old_mode = ps3fb_mode; 742 old_mode = ps3fb_mode;