diff options
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 5a80ac01032f..80600da29137 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -692,7 +692,7 @@ static void aty_set_crtc(const struct atyfb_par *par, const struct crtc *crtc) | |||
692 | aty_st_lcd(LCD_GEN_CNTL, (crtc->lcd_gen_cntl & ~CRTC_RW_SELECT) | | 692 | aty_st_lcd(LCD_GEN_CNTL, (crtc->lcd_gen_cntl & ~CRTC_RW_SELECT) | |
693 | (SHADOW_EN | SHADOW_RW_EN), par); | 693 | (SHADOW_EN | SHADOW_RW_EN), par); |
694 | 694 | ||
695 | DPRINTK("set secondary CRT to %ix%i %c%c\n", | 695 | DPRINTK("set shadow CRT to %ix%i %c%c\n", |
696 | ((((crtc->shadow_h_tot_disp>>16) & 0xff) + 1)<<3), (((crtc->shadow_v_tot_disp>>16) & 0x7ff) + 1), | 696 | ((((crtc->shadow_h_tot_disp>>16) & 0xff) + 1)<<3), (((crtc->shadow_v_tot_disp>>16) & 0x7ff) + 1), |
697 | (crtc->shadow_h_sync_strt_wid & 0x200000)?'N':'P', (crtc->shadow_v_sync_strt_wid & 0x200000)?'N':'P'); | 697 | (crtc->shadow_h_sync_strt_wid & 0x200000)?'N':'P', (crtc->shadow_v_sync_strt_wid & 0x200000)?'N':'P'); |
698 | 698 | ||
@@ -840,11 +840,11 @@ static int aty_var_to_crtc(const struct fb_info *info, | |||
840 | know if one is connected. So it's better to fail then. | 840 | know if one is connected. So it's better to fail then. |
841 | */ | 841 | */ |
842 | if (crtc->lcd_gen_cntl & CRT_ON) { | 842 | if (crtc->lcd_gen_cntl & CRT_ON) { |
843 | PRINTKI("Disable lcd panel, because video mode does not fit.\n"); | 843 | PRINTKI("Disable LCD panel, because video mode does not fit.\n"); |
844 | crtc->lcd_gen_cntl &= ~LCD_ON; | 844 | crtc->lcd_gen_cntl &= ~LCD_ON; |
845 | /*aty_st_lcd(LCD_GEN_CNTL, crtc->lcd_gen_cntl, par);*/ | 845 | /*aty_st_lcd(LCD_GEN_CNTL, crtc->lcd_gen_cntl, par);*/ |
846 | } else { | 846 | } else { |
847 | FAIL("Video mode exceeds size of lcd panel.\nConnect this computer to a conventional monitor if you really need this mode."); | 847 | FAIL("Video mode exceeds size of LCD panel.\nConnect this computer to a conventional monitor if you really need this mode."); |
848 | } | 848 | } |
849 | } | 849 | } |
850 | } | 850 | } |
@@ -858,9 +858,9 @@ static int aty_var_to_crtc(const struct fb_info *info, | |||
858 | vmode &= ~(FB_VMODE_DOUBLE | FB_VMODE_INTERLACED); | 858 | vmode &= ~(FB_VMODE_DOUBLE | FB_VMODE_INTERLACED); |
859 | 859 | ||
860 | /* This is horror! When we simulate, say 640x480 on an 800x600 | 860 | /* This is horror! When we simulate, say 640x480 on an 800x600 |
861 | lcd monitor, the CRTC should be programmed 800x600 values for | 861 | LCD monitor, the CRTC should be programmed 800x600 values for |
862 | the non visible part, but 640x480 for the visible part. | 862 | the non visible part, but 640x480 for the visible part. |
863 | This code has been tested on a laptop with it's 1400x1050 lcd | 863 | This code has been tested on a laptop with it's 1400x1050 LCD |
864 | monitor and a conventional monitor both switched on. | 864 | monitor and a conventional monitor both switched on. |
865 | Tested modes: 1280x1024, 1152x864, 1024x768, 800x600, | 865 | Tested modes: 1280x1024, 1152x864, 1024x768, 800x600, |
866 | works with little glitches also with DOUBLESCAN modes | 866 | works with little glitches also with DOUBLESCAN modes |
@@ -958,7 +958,7 @@ static int aty_var_to_crtc(const struct fb_info *info, | |||
958 | if(vmode & FB_VMODE_INTERLACED) { | 958 | if(vmode & FB_VMODE_INTERLACED) { |
959 | vdisplay >>= 1; | 959 | vdisplay >>= 1; |
960 | 960 | ||
961 | /* The prefered mode for the lcd is not interlaced, so disable it if | 961 | /* The prefered mode for the LCD is not interlaced, so disable it if |
962 | it was enabled. For doublescan there is no problem, because we can | 962 | it was enabled. For doublescan there is no problem, because we can |
963 | compensate for it in the hardware stretching (we stretch half as much) | 963 | compensate for it in the hardware stretching (we stretch half as much) |
964 | */ | 964 | */ |
@@ -3153,15 +3153,15 @@ static void aty_init_lcd(struct atyfb_par *par, u32 bios_base) | |||
3153 | refresh_rates_buf, lcd_refresh_rates[default_refresh_rate]); | 3153 | refresh_rates_buf, lcd_refresh_rates[default_refresh_rate]); |
3154 | par->lcd_refreshrate = lcd_refresh_rates[default_refresh_rate]; | 3154 | par->lcd_refreshrate = lcd_refresh_rates[default_refresh_rate]; |
3155 | /* We now need to determine the crtc parameters for the | 3155 | /* We now need to determine the crtc parameters for the |
3156 | * lcd monitor. This is tricky, because they are not stored | 3156 | * LCD monitor. This is tricky, because they are not stored |
3157 | * individually in the BIOS. Instead, the BIOS contains a | 3157 | * individually in the BIOS. Instead, the BIOS contains a |
3158 | * table of display modes that work for this monitor. | 3158 | * table of display modes that work for this monitor. |
3159 | * | 3159 | * |
3160 | * The idea is that we search for a mode of the same dimensions | 3160 | * The idea is that we search for a mode of the same dimensions |
3161 | * as the dimensions of the lcd monitor. Say our lcd monitor | 3161 | * as the dimensions of the LCD monitor. Say our LCD monitor |
3162 | * is 800x600 pixels, we search for a 800x600 monitor. | 3162 | * is 800x600 pixels, we search for a 800x600 monitor. |
3163 | * The CRTC parameters we find here are the ones that we need | 3163 | * The CRTC parameters we find here are the ones that we need |
3164 | * to use to simulate other resolutions on the lcd screen. | 3164 | * to use to simulate other resolutions on the LCD screen. |
3165 | */ | 3165 | */ |
3166 | lcdmodeptr = (u16 *)(par->lcd_table + 64); | 3166 | lcdmodeptr = (u16 *)(par->lcd_table + 64); |
3167 | while (*lcdmodeptr != 0) { | 3167 | while (*lcdmodeptr != 0) { |