|
@@ -78,23 +78,21 @@ static const struct avset_video_mode {
|
|
|
u32 aspect;
|
|
|
u32 x;
|
|
|
u32 y;
|
|
|
- u32 interlace;
|
|
|
- u32 freq;
|
|
|
} video_mode_table[] = {
|
|
|
{ 0, }, /* auto */
|
|
|
- {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_480I, A_N, 720, 480, 1, 60},
|
|
|
- {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_480P, A_N, 720, 480, 0, 60},
|
|
|
- {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_720P_60HZ, A_N, 1280, 720, 0, 60},
|
|
|
- {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_1080I_60HZ, A_W, 1920, 1080, 1, 60},
|
|
|
- {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_1080P_60HZ, A_W, 1920, 1080, 0, 60},
|
|
|
- {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_576I, A_N, 720, 576, 1, 50},
|
|
|
- {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_576P, A_N, 720, 576, 0, 50},
|
|
|
- {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_720P_50HZ, A_N, 1280, 720, 0, 50},
|
|
|
- {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_1080I_50HZ, A_W, 1920, 1080, 1, 50},
|
|
|
- {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_1080P_50HZ, A_W, 1920, 1080, 0, 50},
|
|
|
- { RGB8, XRGB, PS3AV_CMD_VIDEO_VID_WXGA, A_W, 1280, 768, 0, 60},
|
|
|
- { RGB8, XRGB, PS3AV_CMD_VIDEO_VID_SXGA, A_N, 1280, 1024, 0, 60},
|
|
|
- { RGB8, XRGB, PS3AV_CMD_VIDEO_VID_WUXGA, A_W, 1920, 1200, 0, 60},
|
|
|
+ {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_480I, A_N, 720, 480},
|
|
|
+ {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_480P, A_N, 720, 480},
|
|
|
+ {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_720P_60HZ, A_N, 1280, 720},
|
|
|
+ {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_1080I_60HZ, A_W, 1920, 1080},
|
|
|
+ {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_1080P_60HZ, A_W, 1920, 1080},
|
|
|
+ {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_576I, A_N, 720, 576},
|
|
|
+ {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_576P, A_N, 720, 576},
|
|
|
+ {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_720P_50HZ, A_N, 1280, 720},
|
|
|
+ {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_1080I_50HZ, A_W, 1920, 1080},
|
|
|
+ {YUV444, XRGB, PS3AV_CMD_VIDEO_VID_1080P_50HZ, A_W, 1920, 1080},
|
|
|
+ { RGB8, XRGB, PS3AV_CMD_VIDEO_VID_WXGA, A_W, 1280, 768},
|
|
|
+ { RGB8, XRGB, PS3AV_CMD_VIDEO_VID_SXGA, A_N, 1280, 1024},
|
|
|
+ { RGB8, XRGB, PS3AV_CMD_VIDEO_VID_WUXGA, A_W, 1920, 1200},
|
|
|
};
|
|
|
|
|
|
/* supported CIDs */
|
|
@@ -889,36 +887,6 @@ int ps3av_get_mode(void)
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(ps3av_get_mode);
|
|
|
|
|
|
-int ps3av_get_scanmode(int id)
|
|
|
-{
|
|
|
- int size;
|
|
|
-
|
|
|
- id = id & PS3AV_MODE_MASK;
|
|
|
- size = ARRAY_SIZE(video_mode_table);
|
|
|
- if (id > size - 1 || id < 0) {
|
|
|
- printk(KERN_ERR "%s: invalid mode %d\n", __func__, id);
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
- return video_mode_table[id].interlace;
|
|
|
-}
|
|
|
-
|
|
|
-EXPORT_SYMBOL_GPL(ps3av_get_scanmode);
|
|
|
-
|
|
|
-int ps3av_get_refresh_rate(int id)
|
|
|
-{
|
|
|
- int size;
|
|
|
-
|
|
|
- id = id & PS3AV_MODE_MASK;
|
|
|
- size = ARRAY_SIZE(video_mode_table);
|
|
|
- if (id > size - 1 || id < 0) {
|
|
|
- printk(KERN_ERR "%s: invalid mode %d\n", __func__, id);
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
- return video_mode_table[id].freq;
|
|
|
-}
|
|
|
-
|
|
|
-EXPORT_SYMBOL_GPL(ps3av_get_refresh_rate);
|
|
|
-
|
|
|
/* get resolution by video_mode */
|
|
|
int ps3av_video_mode2res(u32 id, u32 *xres, u32 *yres)
|
|
|
{
|