diff options
Diffstat (limited to 'drivers/video/via/hw.c')
| -rw-r--r-- | drivers/video/via/hw.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c index 76fad92600f0..30668bd17875 100644 --- a/drivers/video/via/hw.c +++ b/drivers/video/via/hw.c | |||
| @@ -1937,9 +1937,8 @@ int viafb_setmode(struct VideoModeTable *vmode_tbl, int video_bpp, | |||
| 1937 | if (viafb_SAMM_ON && | 1937 | if (viafb_SAMM_ON && |
| 1938 | (viaparinfo->lvds_setting_info->iga_path == IGA2)) { | 1938 | (viaparinfo->lvds_setting_info->iga_path == IGA2)) { |
| 1939 | viaparinfo->lvds_setting_info->bpp = video_bpp1; | 1939 | viaparinfo->lvds_setting_info->bpp = video_bpp1; |
| 1940 | viafb_lcd_set_mode(crt_timing1, viaparinfo-> | 1940 | viafb_lcd_set_mode(viaparinfo->lvds_setting_info, |
| 1941 | lvds_setting_info, | 1941 | &viaparinfo->chip_info->lvds_chip_info); |
| 1942 | &viaparinfo->chip_info->lvds_chip_info); | ||
| 1943 | } else { | 1942 | } else { |
| 1944 | /* IGA1 doesn't have LCD scaling, so set it center. */ | 1943 | /* IGA1 doesn't have LCD scaling, so set it center. */ |
| 1945 | if (viaparinfo->lvds_setting_info->iga_path == IGA1) { | 1944 | if (viaparinfo->lvds_setting_info->iga_path == IGA1) { |
| @@ -1947,18 +1946,16 @@ int viafb_setmode(struct VideoModeTable *vmode_tbl, int video_bpp, | |||
| 1947 | LCD_CENTERING; | 1946 | LCD_CENTERING; |
| 1948 | } | 1947 | } |
| 1949 | viaparinfo->lvds_setting_info->bpp = video_bpp; | 1948 | viaparinfo->lvds_setting_info->bpp = video_bpp; |
| 1950 | viafb_lcd_set_mode(crt_timing, viaparinfo-> | 1949 | viafb_lcd_set_mode(viaparinfo->lvds_setting_info, |
| 1951 | lvds_setting_info, | 1950 | &viaparinfo->chip_info->lvds_chip_info); |
| 1952 | &viaparinfo->chip_info->lvds_chip_info); | ||
| 1953 | } | 1951 | } |
| 1954 | } | 1952 | } |
| 1955 | if (viafb_LCD2_ON) { | 1953 | if (viafb_LCD2_ON) { |
| 1956 | if (viafb_SAMM_ON && | 1954 | if (viafb_SAMM_ON && |
| 1957 | (viaparinfo->lvds_setting_info2->iga_path == IGA2)) { | 1955 | (viaparinfo->lvds_setting_info2->iga_path == IGA2)) { |
| 1958 | viaparinfo->lvds_setting_info2->bpp = video_bpp1; | 1956 | viaparinfo->lvds_setting_info2->bpp = video_bpp1; |
| 1959 | viafb_lcd_set_mode(crt_timing1, viaparinfo-> | 1957 | viafb_lcd_set_mode(viaparinfo->lvds_setting_info2, |
| 1960 | lvds_setting_info2, | 1958 | &viaparinfo->chip_info->lvds_chip_info2); |
| 1961 | &viaparinfo->chip_info->lvds_chip_info2); | ||
| 1962 | } else { | 1959 | } else { |
| 1963 | /* IGA1 doesn't have LCD scaling, so set it center. */ | 1960 | /* IGA1 doesn't have LCD scaling, so set it center. */ |
| 1964 | if (viaparinfo->lvds_setting_info2->iga_path == IGA1) { | 1961 | if (viaparinfo->lvds_setting_info2->iga_path == IGA1) { |
| @@ -1966,9 +1963,8 @@ int viafb_setmode(struct VideoModeTable *vmode_tbl, int video_bpp, | |||
| 1966 | LCD_CENTERING; | 1963 | LCD_CENTERING; |
| 1967 | } | 1964 | } |
| 1968 | viaparinfo->lvds_setting_info2->bpp = video_bpp; | 1965 | viaparinfo->lvds_setting_info2->bpp = video_bpp; |
| 1969 | viafb_lcd_set_mode(crt_timing, viaparinfo-> | 1966 | viafb_lcd_set_mode(viaparinfo->lvds_setting_info2, |
| 1970 | lvds_setting_info2, | 1967 | &viaparinfo->chip_info->lvds_chip_info2); |
| 1971 | &viaparinfo->chip_info->lvds_chip_info2); | ||
| 1972 | } | 1968 | } |
| 1973 | } | 1969 | } |
| 1974 | 1970 | ||