Skip to content

Commit

Permalink
ps3av: dont distinguish between boot' and non-boot' autodetection
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Oct 16, 2007
1 parent 466c449 commit ce4c371
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 35 deletions.
35 changes: 6 additions & 29 deletions drivers/ps3/ps3av.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -760,8 +760,7 @@ static void ps3av_fixup_monitor_info(struct ps3av_info_monitor *info)
}
}

static int ps3av_auto_videomode(struct ps3av_pkt_av_get_hw_conf *av_hw_conf,
int boot)
static int ps3av_auto_videomode(struct ps3av_pkt_av_get_hw_conf *av_hw_conf)
{
int i, res, id = 0, dvi = 0, rgb = 0;
struct ps3av_pkt_av_get_monitor_info monitor_info;
Expand Down Expand Up @@ -799,28 +798,6 @@ static int ps3av_auto_videomode(struct ps3av_pkt_av_get_hw_conf *av_hw_conf,
if (ps3av->region & PS3AV_REGION_RGB)
rgb = PS3AV_MODE_RGB;
pr_debug("%s: Using avmulti mode %d\n", __func__, id);
} else if (boot) {
/* HDMI: using DEFAULT HDMI_MODE_ID while booting up */
info = &monitor_info.info;
if (ps3av->region & PS3AV_REGION_60) {
if (info->res_60.res_bits & PS3AV_RESBIT_720x480P)
id = PS3AV_DEFAULT_HDMI_MODE_ID_REG_60;
else if (info->res_50.res_bits & PS3AV_RESBIT_720x576P)
id = PS3AV_DEFAULT_HDMI_MODE_ID_REG_50;
else {
/* default */
id = PS3AV_DEFAULT_HDMI_MODE_ID_REG_60;
}
} else {
if (info->res_50.res_bits & PS3AV_RESBIT_720x576P)
id = PS3AV_DEFAULT_HDMI_MODE_ID_REG_50;
else if (info->res_60.res_bits & PS3AV_RESBIT_720x480P)
id = PS3AV_DEFAULT_HDMI_MODE_ID_REG_60;
else {
/* default */
id = PS3AV_DEFAULT_HDMI_MODE_ID_REG_50;
}
}
}

return id | dvi | rgb;
Expand Down Expand Up @@ -862,7 +839,7 @@ static int ps3av_get_hw_conf(struct ps3av *ps3av)
}

/* set mode using id */
int ps3av_set_video_mode(u32 id, int boot)
int ps3av_set_video_mode(u32 id)
{
int size;
u32 option;
Expand All @@ -876,7 +853,7 @@ int ps3av_set_video_mode(u32 id, int boot)
/* auto mode */
option = id & ~PS3AV_MODE_MASK;
if ((id & PS3AV_MODE_MASK) == 0) {
id = ps3av_auto_videomode(&ps3av->av_hw_conf, boot);
id = ps3av_auto_videomode(&ps3av->av_hw_conf);
if (id < 1) {
printk(KERN_ERR "%s: invalid id :%d\n", __func__, id);
return -EINVAL;
Expand All @@ -896,9 +873,9 @@ int ps3av_set_video_mode(u32 id, int boot)

EXPORT_SYMBOL_GPL(ps3av_set_video_mode);

int ps3av_get_auto_mode(int boot)
int ps3av_get_auto_mode(void)
{
return ps3av_auto_videomode(&ps3av->av_hw_conf, boot);
return ps3av_auto_videomode(&ps3av->av_hw_conf);
}

EXPORT_SYMBOL_GPL(ps3av_get_auto_mode);
Expand Down Expand Up @@ -1044,7 +1021,7 @@ static int ps3av_probe(struct ps3_system_bus_device *dev)
res);

ps3av_get_hw_conf(ps3av);
id = ps3av_auto_videomode(&ps3av->av_hw_conf, 1);
id = ps3av_auto_videomode(&ps3av->av_hw_conf);
mutex_lock(&ps3av->mutex);
ps3av->ps3av_mode = id;
mutex_unlock(&ps3av->mutex);
Expand Down
6 changes: 2 additions & 4 deletions drivers/video/ps3fb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,6 @@ static int ps3fb_set_par(struct fb_info *info)
unsigned int mode;
int i;
unsigned long offset;
static int first = 1;

DPRINTK("xres:%d xv:%d yres:%d yv:%d clock:%d\n",
info->var.xres, info->var.xres_virtual,
Expand All @@ -572,10 +571,9 @@ static int ps3fb_set_par(struct fb_info *info)
/* Keep the special bits we cannot set using fb_var_screeninfo */
ps3fb_mode = (ps3fb_mode & ~PS3AV_MODE_MASK) | mode;

if (ps3av_set_video_mode(ps3fb_mode, first))
if (ps3av_set_video_mode(ps3fb_mode))
return -EINVAL;

first = 0;
return 0;
}

Expand Down Expand Up @@ -737,7 +735,7 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd,
break;

if (!(val & PS3AV_MODE_MASK)) {
u32 id = ps3av_get_auto_mode(0);
u32 id = ps3av_get_auto_mode();
if (id > 0)
val = (val & ~PS3AV_MODE_MASK) | id;
}
Expand Down
4 changes: 2 additions & 2 deletions include/asm-powerpc/ps3av.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -709,9 +709,9 @@ extern int ps3av_cmd_av_get_hw_conf(struct ps3av_pkt_av_get_hw_conf *);
extern int ps3av_cmd_video_get_monitor_info(struct ps3av_pkt_av_get_monitor_info *,
u32);

extern int ps3av_set_video_mode(u32, int);
extern int ps3av_set_video_mode(u32);
extern int ps3av_set_audio_mode(u32, u32, u32, u32, u32);
extern int ps3av_get_auto_mode(int);
extern int ps3av_get_auto_mode(void);
extern int ps3av_get_mode(void);
extern int ps3av_get_scanmode(int);
extern int ps3av_get_refresh_rate(int);
Expand Down

0 comments on commit ce4c371

Please sign in to comment.