tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

viafb: remove the remaining VIA_RES_* uses

Remove the rest of the VIA_RES_* use cases. Obviously this was no longer
useful. Keep the related infrastructure/functions for later use.

No runtime impact expected.

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Florian Tobias Schandinat and committed by
Linus Torvalds 9b24b00c dd73d686

+15 -166
-2
drivers/video/via/chip.h
··· 146 146 int refresh_rate; 147 147 int get_dvi_size_method; 148 148 int max_pixel_clock; 149 - int dvi_panel_size; 150 149 int dvi_panel_hres; 151 150 int dvi_panel_vres; 152 151 int native_size; ··· 159 160 int refresh_rate; 160 161 int get_lcd_size_method; 161 162 int lcd_panel_id; 162 - int lcd_panel_size; 163 163 int lcd_panel_hres; 164 164 int lcd_panel_vres; 165 165 int display_method;
+10 -72
drivers/video/via/dvi.c
··· 23 23 static void tmds_register_write(int index, u8 data); 24 24 static int tmds_register_read(int index); 25 25 static int tmds_register_read_bytes(int index, u8 *buff, int buff_len); 26 - static int dvi_get_panel_size_from_DDCv1(void); 27 - static int dvi_get_panel_size_from_DDCv2(void); 28 - static unsigned char dvi_get_panel_info(void); 26 + static void dvi_get_panel_size_from_DDCv1(void); 27 + static void dvi_get_panel_size_from_DDCv2(void); 28 + static void dvi_get_panel_info(void); 29 29 static int viafb_dvi_query_EDID(void); 30 30 31 31 static int check_tmds_chip(int device_id_subaddr, int device_id) ··· 314 314 return false; 315 315 } 316 316 317 - /* 318 - * 319 - * int dvi_get_panel_size_from_DDCv1(void) 317 + /* void dvi_get_panel_size_from_DDCv1(void) 320 318 * 321 319 * - Get Panel Size Using EDID1 Table 322 - * 323 - * Return Type: int 324 - * 325 320 */ 326 - static int dvi_get_panel_size_from_DDCv1(void) 321 + static void dvi_get_panel_size_from_DDCv1(void) 327 322 { 328 - int i, max_h = 0, max_v = 0, tmp, restore; 323 + int i, max_h = 0, tmp, restore; 329 324 unsigned char rData; 330 325 unsigned char EDID_DATA[18]; 331 326 ··· 386 391 387 392 switch (max_h) { 388 393 case 640: 389 - viaparinfo->tmds_setting_info->dvi_panel_size = 390 - VIA_RES_640X480; 391 394 break; 392 395 case 800: 393 - viaparinfo->tmds_setting_info->dvi_panel_size = 394 - VIA_RES_800X600; 395 396 break; 396 397 case 1024: 397 - viaparinfo->tmds_setting_info->dvi_panel_size = 398 - VIA_RES_1024X768; 399 398 break; 400 399 case 1280: 401 - viaparinfo->tmds_setting_info->dvi_panel_size = 402 - VIA_RES_1280X1024; 403 400 break; 404 401 case 1400: 405 - viaparinfo->tmds_setting_info->dvi_panel_size = 406 - VIA_RES_1400X1050; 407 402 break; 408 403 case 1440: 409 - viaparinfo->tmds_setting_info->dvi_panel_size = 410 - VIA_RES_1440X1050; 411 404 break; 412 405 case 1600: 413 - viaparinfo->tmds_setting_info->dvi_panel_size = 414 - VIA_RES_1600X1200; 415 406 break; 416 407 case 1920: 417 - if (max_v == 1200) { 418 - viaparinfo->tmds_setting_info->dvi_panel_size = 419 - VIA_RES_1920X1200; 420 - } else { 421 - viaparinfo->tmds_setting_info->dvi_panel_size = 422 - VIA_RES_1920X1080; 423 - } 424 408 425 409 break; 426 410 default: 427 - viaparinfo->tmds_setting_info->dvi_panel_size = 428 - VIA_RES_1024X768; 429 411 DEBUG_MSG(KERN_INFO "Unknown panel size max resolution = %d !\ 430 412 set default panel size.\n", max_h); 431 413 break; ··· 411 439 DEBUG_MSG(KERN_INFO "DVI max pixelclock = %d\n", 412 440 viaparinfo->tmds_setting_info->max_pixel_clock); 413 441 viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = restore; 414 - return viaparinfo->tmds_setting_info->dvi_panel_size; 415 442 } 416 443 417 - /* 418 - * 419 - * int dvi_get_panel_size_from_DDCv2(void) 444 + /* void dvi_get_panel_size_from_DDCv2(void) 420 445 * 421 446 * - Get Panel Size Using EDID2 Table 422 - * 423 - * Return Type: int 424 - * 425 447 */ 426 - static int dvi_get_panel_size_from_DDCv2(void) 448 + static void dvi_get_panel_size_from_DDCv2(void) 427 449 { 428 450 int HSize = 0, restore; 429 451 unsigned char R_Buffer[2]; ··· 434 468 435 469 switch (HSize) { 436 470 case 640: 437 - viaparinfo->tmds_setting_info->dvi_panel_size = 438 - VIA_RES_640X480; 439 471 break; 440 472 case 800: 441 - viaparinfo->tmds_setting_info->dvi_panel_size = 442 - VIA_RES_800X600; 443 473 break; 444 474 case 1024: 445 - viaparinfo->tmds_setting_info->dvi_panel_size = 446 - VIA_RES_1024X768; 447 475 break; 448 476 case 1280: 449 - viaparinfo->tmds_setting_info->dvi_panel_size = 450 - VIA_RES_1280X1024; 451 477 break; 452 478 case 1400: 453 - viaparinfo->tmds_setting_info->dvi_panel_size = 454 - VIA_RES_1400X1050; 455 479 break; 456 480 case 1440: 457 - viaparinfo->tmds_setting_info->dvi_panel_size = 458 - VIA_RES_1440X1050; 459 481 break; 460 482 case 1600: 461 - viaparinfo->tmds_setting_info->dvi_panel_size = 462 - VIA_RES_1600X1200; 463 483 break; 464 484 default: 465 - viaparinfo->tmds_setting_info->dvi_panel_size = 466 - VIA_RES_1024X768; 467 485 DEBUG_MSG(KERN_INFO "Unknown panel size max resolution = %d!\ 468 486 set default panel size.\n", HSize); 469 487 break; 470 488 } 471 489 472 490 viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = restore; 473 - return viaparinfo->tmds_setting_info->dvi_panel_size; 474 491 } 475 492 476 - /* 477 - * 478 - * unsigned char dvi_get_panel_info(void) 493 + /* unsigned char dvi_get_panel_info(void) 479 494 * 480 495 * - Get Panel Size 481 - * 482 - * Return Type: unsigned char 483 496 */ 484 - static unsigned char dvi_get_panel_info(void) 497 + static void dvi_get_panel_info(void) 485 498 { 486 - unsigned char dvipanelsize; 487 499 DEBUG_MSG(KERN_INFO "dvi_get_panel_info! \n"); 488 500 489 501 viafb_dvi_sense(); ··· 475 531 default: 476 532 break; 477 533 } 478 - 479 - DEBUG_MSG(KERN_INFO "dvi panel size is %2d \n", 480 - viaparinfo->tmds_setting_info->dvi_panel_size); 481 - dvipanelsize = (unsigned char)(viaparinfo-> 482 - tmds_setting_info->dvi_panel_size); 483 - return dvipanelsize; 484 534 } 485 535 486 536 /* If Disable DVI, turn off pad */
+5 -37
drivers/video/via/lcd.c
··· 61 61 62 62 static int check_lvds_chip(int device_id_subaddr, int device_id); 63 63 static bool lvds_identify_integratedlvds(void); 64 - static int fp_id_to_vindex(int panel_id); 64 + static void fp_id_to_vindex(int panel_id); 65 65 static int lvds_register_read(int index); 66 66 static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres, 67 67 int panel_vres); ··· 127 127 break; 128 128 case GET_LCD_SIZE_BY_VGA_BIOS: 129 129 DEBUG_MSG(KERN_INFO "Get LCD Size method by VGA BIOS !!\n"); 130 - viaparinfo->lvds_setting_info->lcd_panel_size = 131 - fp_id_to_vindex(viafb_lcd_panel_id); 130 + fp_id_to_vindex(viafb_lcd_panel_id); 132 131 DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n", 133 132 viaparinfo->lvds_setting_info->lcd_panel_id); 134 - DEBUG_MSG(KERN_INFO "LCD Panel Size = %d\n", 135 - viaparinfo->lvds_setting_info->lcd_panel_size); 136 133 break; 137 134 case GET_LCD_SIZE_BY_USER_SETTING: 138 135 DEBUG_MSG(KERN_INFO "Get LCD Size method by user setting !!\n"); 139 - viaparinfo->lvds_setting_info->lcd_panel_size = 140 - fp_id_to_vindex(viafb_lcd_panel_id); 136 + fp_id_to_vindex(viafb_lcd_panel_id); 141 137 DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n", 142 138 viaparinfo->lvds_setting_info->lcd_panel_id); 143 - DEBUG_MSG(KERN_INFO "LCD Panel Size = %d\n", 144 - viaparinfo->lvds_setting_info->lcd_panel_size); 145 139 break; 146 140 default: 147 141 DEBUG_MSG(KERN_INFO "viafb_init_lcd_size fail\n"); 148 142 viaparinfo->lvds_setting_info->lcd_panel_id = 149 143 LCD_PANEL_ID1_800X600; 150 - viaparinfo->lvds_setting_info->lcd_panel_size = 151 - fp_id_to_vindex(LCD_PANEL_ID1_800X600); 144 + fp_id_to_vindex(LCD_PANEL_ID1_800X600); 152 145 } 153 146 viaparinfo->lvds_setting_info2->lcd_panel_id = 154 147 viaparinfo->lvds_setting_info->lcd_panel_id; 155 - viaparinfo->lvds_setting_info2->lcd_panel_size = 156 - viaparinfo->lvds_setting_info->lcd_panel_size; 157 148 viaparinfo->lvds_setting_info2->lcd_panel_hres = 158 149 viaparinfo->lvds_setting_info->lcd_panel_hres; 159 150 viaparinfo->lvds_setting_info2->lcd_panel_vres = ··· 241 250 return FAIL; 242 251 } 243 252 244 - static int fp_id_to_vindex(int panel_id) 253 + static void fp_id_to_vindex(int panel_id) 245 254 { 246 255 DEBUG_MSG(KERN_INFO "fp_get_panel_id()\n"); 247 256 ··· 257 266 LCD_PANEL_ID0_640X480; 258 267 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 259 268 viaparinfo->lvds_setting_info->LCDDithering = 1; 260 - return VIA_RES_640X480; 261 269 break; 262 270 case 0x1: 263 271 viaparinfo->lvds_setting_info->lcd_panel_hres = 800; ··· 265 275 LCD_PANEL_ID1_800X600; 266 276 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 267 277 viaparinfo->lvds_setting_info->LCDDithering = 1; 268 - return VIA_RES_800X600; 269 278 break; 270 279 case 0x2: 271 280 viaparinfo->lvds_setting_info->lcd_panel_hres = 1024; ··· 273 284 LCD_PANEL_ID2_1024X768; 274 285 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 275 286 viaparinfo->lvds_setting_info->LCDDithering = 1; 276 - return VIA_RES_1024X768; 277 287 break; 278 288 case 0x3: 279 289 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280; ··· 281 293 LCD_PANEL_ID3_1280X768; 282 294 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 283 295 viaparinfo->lvds_setting_info->LCDDithering = 1; 284 - return VIA_RES_1280X768; 285 296 break; 286 297 case 0x4: 287 298 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280; ··· 289 302 LCD_PANEL_ID4_1280X1024; 290 303 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1; 291 304 viaparinfo->lvds_setting_info->LCDDithering = 1; 292 - return VIA_RES_1280X1024; 293 305 break; 294 306 case 0x5: 295 307 viaparinfo->lvds_setting_info->lcd_panel_hres = 1400; ··· 297 311 LCD_PANEL_ID5_1400X1050; 298 312 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1; 299 313 viaparinfo->lvds_setting_info->LCDDithering = 1; 300 - return VIA_RES_1400X1050; 301 314 break; 302 315 case 0x6: 303 316 viaparinfo->lvds_setting_info->lcd_panel_hres = 1600; ··· 305 320 LCD_PANEL_ID6_1600X1200; 306 321 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1; 307 322 viaparinfo->lvds_setting_info->LCDDithering = 1; 308 - return VIA_RES_1600X1200; 309 323 break; 310 324 case 0x8: 311 325 viaparinfo->lvds_setting_info->lcd_panel_hres = 800; ··· 313 329 LCD_PANEL_IDA_800X480; 314 330 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 315 331 viaparinfo->lvds_setting_info->LCDDithering = 1; 316 - return VIA_RES_800X480; 317 332 break; 318 333 case 0x9: 319 334 viaparinfo->lvds_setting_info->lcd_panel_hres = 1024; ··· 321 338 LCD_PANEL_ID2_1024X768; 322 339 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1; 323 340 viaparinfo->lvds_setting_info->LCDDithering = 1; 324 - return VIA_RES_1024X768; 325 341 break; 326 342 case 0xA: 327 343 viaparinfo->lvds_setting_info->lcd_panel_hres = 1024; ··· 329 347 LCD_PANEL_ID2_1024X768; 330 348 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 331 349 viaparinfo->lvds_setting_info->LCDDithering = 0; 332 - return VIA_RES_1024X768; 333 350 break; 334 351 case 0xB: 335 352 viaparinfo->lvds_setting_info->lcd_panel_hres = 1024; ··· 337 356 LCD_PANEL_ID2_1024X768; 338 357 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1; 339 358 viaparinfo->lvds_setting_info->LCDDithering = 0; 340 - return VIA_RES_1024X768; 341 359 break; 342 360 case 0xC: 343 361 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280; ··· 345 365 LCD_PANEL_ID3_1280X768; 346 366 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 347 367 viaparinfo->lvds_setting_info->LCDDithering = 0; 348 - return VIA_RES_1280X768; 349 368 break; 350 369 case 0xD: 351 370 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280; ··· 353 374 LCD_PANEL_ID4_1280X1024; 354 375 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1; 355 376 viaparinfo->lvds_setting_info->LCDDithering = 0; 356 - return VIA_RES_1280X1024; 357 377 break; 358 378 case 0xE: 359 379 viaparinfo->lvds_setting_info->lcd_panel_hres = 1400; ··· 361 383 LCD_PANEL_ID5_1400X1050; 362 384 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1; 363 385 viaparinfo->lvds_setting_info->LCDDithering = 0; 364 - return VIA_RES_1400X1050; 365 386 break; 366 387 case 0xF: 367 388 viaparinfo->lvds_setting_info->lcd_panel_hres = 1600; ··· 369 392 LCD_PANEL_ID6_1600X1200; 370 393 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1; 371 394 viaparinfo->lvds_setting_info->LCDDithering = 0; 372 - return VIA_RES_1600X1200; 373 395 break; 374 396 case 0x10: 375 397 viaparinfo->lvds_setting_info->lcd_panel_hres = 1366; ··· 377 401 LCD_PANEL_ID7_1366X768; 378 402 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 379 403 viaparinfo->lvds_setting_info->LCDDithering = 0; 380 - return VIA_RES_1368X768; 381 404 break; 382 405 case 0x11: 383 406 viaparinfo->lvds_setting_info->lcd_panel_hres = 1024; ··· 385 410 LCD_PANEL_ID8_1024X600; 386 411 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 387 412 viaparinfo->lvds_setting_info->LCDDithering = 1; 388 - return VIA_RES_1024X600; 389 413 break; 390 414 case 0x12: 391 415 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280; ··· 393 419 LCD_PANEL_ID3_1280X768; 394 420 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1; 395 421 viaparinfo->lvds_setting_info->LCDDithering = 1; 396 - return VIA_RES_1280X768; 397 422 break; 398 423 case 0x13: 399 424 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280; ··· 401 428 LCD_PANEL_ID9_1280X800; 402 429 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 403 430 viaparinfo->lvds_setting_info->LCDDithering = 1; 404 - return VIA_RES_1280X800; 405 431 break; 406 432 case 0x14: 407 433 viaparinfo->lvds_setting_info->lcd_panel_hres = 1360; ··· 409 437 LCD_PANEL_IDB_1360X768; 410 438 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 411 439 viaparinfo->lvds_setting_info->LCDDithering = 0; 412 - return VIA_RES_1360X768; 413 440 break; 414 441 case 0x15: 415 442 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280; ··· 417 446 LCD_PANEL_ID3_1280X768; 418 447 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1; 419 448 viaparinfo->lvds_setting_info->LCDDithering = 0; 420 - return VIA_RES_1280X768; 421 449 break; 422 450 case 0x16: 423 451 viaparinfo->lvds_setting_info->lcd_panel_hres = 480; ··· 425 455 LCD_PANEL_IDC_480X640; 426 456 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 427 457 viaparinfo->lvds_setting_info->LCDDithering = 1; 428 - return VIA_RES_480X640; 429 458 break; 430 459 default: 431 460 viaparinfo->lvds_setting_info->lcd_panel_hres = 800; ··· 433 464 LCD_PANEL_ID1_800X600; 434 465 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; 435 466 viaparinfo->lvds_setting_info->LCDDithering = 1; 436 - return VIA_RES_800X600; 437 467 } 438 468 } 439 469
-55
drivers/video/via/share.h
··· 43 43 /* Video Memory Size */ 44 44 #define VIDEO_MEMORY_SIZE_16M 0x1000000 45 45 46 - /* Definition Mode Index 47 - */ 48 - #define VIA_RES_640X480 0 49 - #define VIA_RES_800X600 1 50 - #define VIA_RES_1024X768 2 51 - #define VIA_RES_1152X864 3 52 - #define VIA_RES_1280X1024 4 53 - #define VIA_RES_1600X1200 5 54 - #define VIA_RES_1440X1050 6 55 - #define VIA_RES_1280X768 7 56 - #define VIA_RES_1280X960 8 57 - #define VIA_RES_1920X1440 9 58 - #define VIA_RES_848X480 10 59 - #define VIA_RES_1400X1050 11 60 - #define VIA_RES_720X480 12 61 - #define VIA_RES_720X576 13 62 - #define VIA_RES_1024X512 14 63 - #define VIA_RES_856X480 15 64 - #define VIA_RES_1024X576 16 65 - #define VIA_RES_640X400 17 66 - #define VIA_RES_1280X720 18 67 - #define VIA_RES_1920X1080 19 68 - #define VIA_RES_800X480 20 69 - #define VIA_RES_1368X768 21 70 - #define VIA_RES_1024X600 22 71 - #define VIA_RES_1280X800 23 72 - #define VIA_RES_1680X1050 24 73 - #define VIA_RES_960X600 25 74 - #define VIA_RES_1000X600 26 75 - #define VIA_RES_1088X612 27 76 - #define VIA_RES_1152X720 28 77 - #define VIA_RES_1200X720 29 78 - #define VIA_RES_1280X600 30 79 - #define VIA_RES_1360X768 31 80 - #define VIA_RES_1366X768 32 81 - #define VIA_RES_1440X900 33 82 - #define VIA_RES_1600X900 34 83 - #define VIA_RES_1600X1024 35 84 - #define VIA_RES_1792X1344 36 85 - #define VIA_RES_1856X1392 37 86 - #define VIA_RES_1920X1200 38 87 - #define VIA_RES_2048X1536 39 88 - #define VIA_RES_480X640 40 89 - 90 - /*Reduce Blanking*/ 91 - #define VIA_RES_1360X768_RB 131 92 - #define VIA_RES_1440X900_RB 133 93 - #define VIA_RES_1400X1050_RB 111 94 - #define VIA_RES_1600X900_RB 134 95 - #define VIA_RES_1680X1050_RB 124 96 - #define VIA_RES_1920X1080_RB 119 97 - #define VIA_RES_1920X1200_RB 138 98 - 99 - #define VIA_RES_INVALID 255 100 - 101 46 /* standard VGA IO port 102 47 */ 103 48 #define VIARMisc 0x3CC