Skip to content

L
linux
Commit c5f34757 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for-linus' of git://github.com/schandinat/linux-2.6 

* 'for-linus' of git://github.com/schandinat/linux-2.6:
  drivers/video/via/via-gpio.c: fix warning
  viafb: Depends on X86
  fbdev: section cleanup in viafb driver
  viafb: fix accel_flags check_var bug
  viafb: probe cleanups
  viafb: remove ioctls which break the framebuffer interface
  viafb: update fix before calculating depth
  viafb: PLL value cleanup
  viafb: simplify lcd size "detection"
  viafb: fix PCI table
  viafb: add lcd scaling support for some IGPs
  viafb: improve lcd code readability
  viafb: remove duplicated scaling code
  MAINTAINERS: update viafb entry
parents 537d8478 f2709837
Hide whitespace changes
Inline Side-by-side
Showing with 449 additions and 902 deletions
MAINTAINERS
View file @ c5f34757
...@@ -6178,9 +6178,12 @@ F: drivers/mmc/host/via-sdmmc.c ...@@ -6178,9 +6178,12 @@ F: drivers/mmc/host/via-sdmmc.c
VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
M: Joseph Chan <JosephChan@via.com.tw> M: Joseph Chan <JosephChan@via.com.tw>
M: Scott Fang <ScottFang@viatech.com.cn> M: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
L: linux-fbdev@vger.kernel.org L: linux-fbdev@vger.kernel.org
S: Maintained S: Maintained
F: include/linux/via-core.h
F: include/linux/via-gpio.h
F: include/linux/via_i2c.h
F: drivers/video/via/ F: drivers/video/via/
VIA VELOCITY NETWORK DRIVER VIA VELOCITY NETWORK DRIVER
......
drivers/video/Kconfig
View file @ c5f34757
...@@ -1505,7 +1505,7 @@ config FB_SIS_315 ...@@ -1505,7 +1505,7 @@ config FB_SIS_315
config FB_VIA config FB_VIA
tristate "VIA UniChrome (Pro) and Chrome9 display support" tristate "VIA UniChrome (Pro) and Chrome9 display support"
depends on FB && PCI depends on FB && PCI && X86
select FB_CFB_FILLRECT select FB_CFB_FILLRECT
select FB_CFB_COPYAREA select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT select FB_CFB_IMAGEBLIT
......
drivers/video/via/chip.h
View file @ c5f34757
...@@ -160,7 +160,6 @@ struct lvds_setting_information { ...@@ -160,7 +160,6 @@ struct lvds_setting_information {
int v_active; int v_active;
int bpp; int bpp;
int refresh_rate; int refresh_rate;
int get_lcd_size_method;
int lcd_panel_id; int lcd_panel_id;
int lcd_panel_hres; int lcd_panel_hres;
int lcd_panel_vres; int lcd_panel_vres;
......
drivers/video/via/hw.c
View file @ c5f34757
...@@ -23,143 +23,341 @@ ...@@ -23,143 +23,341 @@
#include "global.h" #include "global.h"
static struct pll_map pll_value[] = { static struct pll_map pll_value[] = {
{CLK_25_175M, CLE266_PLL_25_175M, K800_PLL_25_175M, {25175000,
CX700_25_175M, VX855_25_175M}, {99, 7, 3},
{CLK_29_581M, CLE266_PLL_29_581M, K800_PLL_29_581M, {85, 3, 4}, /* ignoring bit difference: 0x00008000 */
CX700_29_581M, VX855_29_581M}, {141, 5, 4},
{CLK_26_880M, CLE266_PLL_26_880M, K800_PLL_26_880M, {141, 5, 4} },
CX700_26_880M, VX855_26_880M}, {29581000,
{CLK_31_490M, CLE266_PLL_31_490M, K800_PLL_31_490M, {33, 4, 2},
CX700_31_490M, VX855_31_490M}, {66, 2, 4}, /* ignoring bit difference: 0x00808000 */
{CLK_31_500M, CLE266_PLL_31_500M, K800_PLL_31_500M, {166, 5, 4}, /* ignoring bit difference: 0x00008000 */
CX700_31_500M, VX855_31_500M}, {165, 5, 4} },
{CLK_31_728M, CLE266_PLL_31_728M, K800_PLL_31_728M, {26880000,
CX700_31_728M, VX855_31_728M}, {15, 4, 1},
{CLK_32_668M, CLE266_PLL_32_668M, K800_PLL_32_668M, {30, 2, 3}, /* ignoring bit difference: 0x00808000 */
CX700_32_668M, VX855_32_668M}, {150, 5, 4},
{CLK_36_000M, CLE266_PLL_36_000M, K800_PLL_36_000M, {150, 5, 4} },
CX700_36_000M, VX855_36_000M}, {31500000,
{CLK_40_000M, CLE266_PLL_40_000M, K800_PLL_40_000M, {53, 3, 3}, /* ignoring bit difference: 0x00008000 */
CX700_40_000M, VX855_40_000M}, {141, 4, 4}, /* ignoring bit difference: 0x00008000 */
{CLK_41_291M, CLE266_PLL_41_291M, K800_PLL_41_291M, {176, 5, 4},
CX700_41_291M, VX855_41_291M}, {176, 5, 4} },
{CLK_43_163M, CLE266_PLL_43_163M, K800_PLL_43_163M, {31728000,
CX700_43_163M, VX855_43_163M}, {31, 7, 1},
{CLK_45_250M, CLE266_PLL_45_250M, K800_PLL_45_250M, {177, 5, 4}, /* ignoring bit difference: 0x00008000 */
CX700_45_250M, VX855_45_250M}, {177, 5, 4},
{CLK_46_000M, CLE266_PLL_46_000M, K800_PLL_46_000M, {142, 4, 4} },
CX700_46_000M, VX855_46_000M}, {32688000,
{CLK_46_996M, CLE266_PLL_46_996M, K800_PLL_46_996M, {73, 4, 3},
CX700_46_996M, VX855_46_996M}, {146, 4, 4}, /* ignoring bit difference: 0x00008000 */
{CLK_48_000M, CLE266_PLL_48_000M, K800_PLL_48_000M, {183, 5, 4},
CX700_48_000M, VX855_48_000M}, {146, 4, 4} },
{CLK_48_875M, CLE266_PLL_48_875M, K800_PLL_48_875M, {36000000,
CX700_48_875M, VX855_48_875M}, {101, 5, 3}, /* ignoring bit difference: 0x00008000 */
{CLK_49_500M, CLE266_PLL_49_500M, K800_PLL_49_500M, {161, 4, 4}, /* ignoring bit difference: 0x00008000 */
CX700_49_500M, VX855_49_500M}, {202, 5, 4},
{CLK_52_406M, CLE266_PLL_52_406M, K800_PLL_52_406M, {161, 4, 4} },
CX700_52_406M, VX855_52_406M}, {40000000,
{CLK_52_977M, CLE266_PLL_52_977M, K800_PLL_52_977M, {89, 4, 3},
CX700_52_977M, VX855_52_977M}, {89, 4, 3}, /* ignoring bit difference: 0x00008000 */
{CLK_56_250M, CLE266_PLL_56_250M, K800_PLL_56_250M, {112, 5, 3},
CX700_56_250M, VX855_56_250M}, {112, 5, 3} },
{CLK_57_275M, 0, 0, 0, VX855_57_275M}, {41291000,
{CLK_60_466M, CLE266_PLL_60_466M, K800_PLL_60_466M, {23, 4, 1},
CX700_60_466M, VX855_60_466M}, {69, 3, 3}, /* ignoring bit difference: 0x00008000 */
{CLK_61_500M, CLE266_PLL_61_500M, K800_PLL_61_500M, {115, 5, 3},
CX700_61_500M, VX855_61_500M}, {115, 5, 3} },
{CLK_65_000M, CLE266_PLL_65_000M, K800_PLL_65_000M, {43163000,
CX700_65_000M, VX855_65_000M}, {121, 5, 3},
{CLK_65_178M, CLE266_PLL_65_178M, K800_PLL_65_178M, {121, 5, 3}, /* ignoring bit difference: 0x00008000 */
CX700_65_178M, VX855_65_178M}, {121, 5, 3},
{CLK_66_750M, CLE266_PLL_66_750M, K800_PLL_66_750M, {121, 5, 3} },
CX700_66_750M, VX855_66_750M}, {45250000,
{CLK_68_179M, CLE266_PLL_68_179M, K800_PLL_68_179M, {127, 5, 3},
CX700_68_179M, VX855_68_179M}, {127, 5, 3}, /* ignoring bit difference: 0x00808000 */
{CLK_69_924M, CLE266_PLL_69_924M, K800_PLL_69_924M, {127, 5, 3},
CX700_69_924M, VX855_69_924M}, {127, 5, 3} },
{CLK_70_159M, CLE266_PLL_70_159M, K800_PLL_70_159M, {46000000,
CX700_70_159M, VX855_70_159M}, {90, 7, 2},
{CLK_72_000M, CLE266_PLL_72_000M, K800_PLL_72_000M, {103, 4, 3}, /* ignoring bit difference: 0x00008000 */
CX700_72_000M, VX855_72_000M}, {129, 5, 3},
{CLK_78_750M, CLE266_PLL_78_750M, K800_PLL_78_750M, {103, 4, 3} },
CX700_78_750M, VX855_78_750M}, {46996000,
{CLK_80_136M, CLE266_PLL_80_136M, K800_PLL_80_136M, {105, 4, 3}, /* ignoring bit difference: 0x00008000 */
CX700_80_136M, VX855_80_136M}, {131, 5, 3}, /* ignoring bit difference: 0x00808000 */
{CLK_83_375M, CLE266_PLL_83_375M, K800_PLL_83_375M, {131, 5, 3}, /* ignoring bit difference: 0x00808000 */
CX700_83_375M, VX855_83_375M}, {105, 4, 3} },
{CLK_83_950M, CLE266_PLL_83_950M, K800_PLL_83_950M, {48000000,
CX700_83_950M, VX855_83_950M}, {67, 20, 0},
{CLK_84_750M, CLE266_PLL_84_750M, K800_PLL_84_750M, {134, 5, 3}, /* ignoring bit difference: 0x00808000 */
CX700_84_750M, VX855_84_750M}, {134, 5, 3},
{CLK_85_860M, CLE266_PLL_85_860M, K800_PLL_85_860M, {134, 5, 3} },
CX700_85_860M, VX855_85_860M}, {48875000,
{CLK_88_750M, CLE266_PLL_88_750M, K800_PLL_88_750M, {99, 29, 0},
CX700_88_750M, VX855_88_750M}, {82, 3, 3}, /* ignoring bit difference: 0x00808000 */
{CLK_94_500M, CLE266_PLL_94_500M, K800_PLL_94_500M, {82, 3, 3}, /* ignoring bit difference: 0x00808000 */
CX700_94_500M, VX855_94_500M}, {137, 5, 3} },
{CLK_97_750M, CLE266_PLL_97_750M, K800_PLL_97_750M, {49500000,
CX700_97_750M, VX855_97_750M}, {83, 6, 2},
{CLK_101_000M, CLE266_PLL_101_000M, K800_PLL_101_000M, {83, 3, 3}, /* ignoring bit difference: 0x00008000 */
CX700_101_000M, VX855_101_000M}, {138, 5, 3},
{CLK_106_500M, CLE266_PLL_106_500M, K800_PLL_106_500M, {83, 3, 3} },
CX700_106_500M, VX855_106_500M}, {52406000,
{CLK_108_000M, CLE266_PLL_108_000M, K800_PLL_108_000M, {117, 4, 3},
CX700_108_000M, VX855_108_000M}, {117, 4, 3}, /* ignoring bit difference: 0x00008000 */
{CLK_113_309M, CLE266_PLL_113_309M, K800_PLL_113_309M, {117, 4, 3},
CX700_113_309M, VX855_113_309M}, {88, 3, 3} },
{CLK_118_840M, CLE266_PLL_118_840M, K800_PLL_118_840M, {52977000,
CX700_118_840M, VX855_118_840M}, {37, 5, 1},
{CLK_119_000M, CLE266_PLL_119_000M, K800_PLL_119_000M, {148, 5, 3}, /* ignoring bit difference: 0x00808000 */
CX700_119_000M, VX855_119_000M}, {148, 5, 3},
{CLK_121_750M, CLE266_PLL_121_750M, K800_PLL_121_750M, {148, 5, 3} },
CX700_121_750M, 0}, {56250000,
{CLK_125_104M, CLE266_PLL_125_104M, K800_PLL_125_104M, {55, 7, 1}, /* ignoring bit difference: 0x00008000 */
CX700_125_104M, 0}, {126, 4, 3}, /* ignoring bit difference: 0x00008000 */
{CLK_133_308M, CLE266_PLL_133_308M, K800_PLL_133_308M, {157, 5, 3},
CX700_133_308M, 0}, {157, 5, 3} },
{CLK_135_000M, CLE266_PLL_135_000M, K800_PLL_135_000M, {57275000,
CX700_135_000M, VX855_135_000M}, {0, 0, 0},
{CLK_136_700M, CLE266_PLL_136_700M, K800_PLL_136_700M, {2, 2, 0},
CX700_136_700M, VX855_136_700M}, {2, 2, 0},
{CLK_138_400M, CLE266_PLL_138_400M, K800_PLL_138_400M, {157, 5, 3} }, /* ignoring bit difference: 0x00808000 */
CX700_138_400M, VX855_138_400M}, {60466000,
{CLK_146_760M, CLE266_PLL_146_760M, K800_PLL_146_760M, {76, 9, 1},
CX700_146_760M, VX855_146_760M}, {169, 5, 3}, /* ignoring bit difference: 0x00808000 */
{CLK_153_920M, CLE266_PLL_153_920M, K800_PLL_153_920M, {169, 5, 3}, /* FIXED: old = {72, 2, 3} */
CX700_153_920M, VX855_153_920M}, {169, 5, 3} },
{CLK_156_000M, CLE266_PLL_156_000M, K800_PLL_156_000M, {61500000,
CX700_156_000M, VX855_156_000M}, {86, 20, 0},
{CLK_157_500M, CLE266_PLL_157_500M, K800_PLL_157_500M, {172, 5, 3}, /* ignoring bit difference: 0x00808000 */
CX700_157_500M, VX855_157_500M}, {172, 5, 3},
{CLK_162_000M, CLE266_PLL_162_000M, K800_PLL_162_000M, {172, 5, 3} },
CX700_162_000M, VX855_162_000M}, {65000000,
{CLK_187_000M, CLE266_PLL_187_000M, K800_PLL_187_000M, {109, 6, 2}, /* ignoring bit difference: 0x00008000 */
CX700_187_000M, VX855_187_000M}, {109, 3, 3}, /* ignoring bit difference: 0x00008000 */
{CLK_193_295M, CLE266_PLL_193_295M, K800_PLL_193_295M, {109, 3, 3},
CX700_193_295M, VX855_193_295M}, {109, 3, 3} },
{CLK_202_500M, CLE266_PLL_202_500M, K800_PLL_202_500M, {65178000,
CX700_202_500M, VX855_202_500M}, {91, 5, 2},
{CLK_204_000M, CLE266_PLL_204_000M, K800_PLL_204_000M, {182, 5, 3}, /* ignoring bit difference: 0x00808000 */
CX700_204_000M, VX855_204_000M}, {109, 3, 3},
{CLK_218_500M, CLE266_PLL_218_500M, K800_PLL_218_500M, {182, 5, 3} },
CX700_218_500M, VX855_218_500M}, {66750000,
{CLK_234_000M, CLE266_PLL_234_000M, K800_PLL_234_000M, {75, 4, 2},
CX700_234_000M, VX855_234_000M}, {150, 4, 3}, /* ignoring bit difference: 0x00808000 */
{CLK_267_250M, CLE266_PLL_267_250M, K800_PLL_267_250M, {150, 4, 3},
CX700_267_250M, VX855_267_250M}, {112, 3, 3} },
{CLK_297_500M, CLE266_PLL_297_500M, K800_PLL_297_500M, {68179000,
CX700_297_500M, VX855_297_500M}, {19, 4, 0},
{CLK_74_481M, CLE266_PLL_74_481M, K800_PLL_74_481M, {114, 3, 3}, /* ignoring bit difference: 0x00008000 */
CX700_74_481M, VX855_74_481M}, {190, 5, 3},
{CLK_172_798M, CLE266_PLL_172_798M, K800_PLL_172_798M, {191, 5, 3} },
CX700_172_798M, VX855_172_798M}, {69924000,
{CLK_122_614M, CLE266_PLL_122_614M, K800_PLL_122_614M, {83, 17, 0},
CX700_122_614M, VX855_122_614M}, {195, 5, 3}, /* ignoring bit difference: 0x00808000 */
{CLK_74_270M, CLE266_PLL_74_270M, K800_PLL_74_270M, {195, 5, 3},
CX700_74_270M, 0}, {195, 5, 3} },
{CLK_148_500M, CLE266_PLL_148_500M, K800_PLL_148_500M, {70159000,
CX700_148_500M, VX855_148_500M} {98, 20, 0},
{196, 5, 3}, /* ignoring bit difference: 0x00808000 */
{196, 5, 3},
{195, 5, 3} },
{72000000,
{121, 24, 0},
{161, 4, 3}, /* ignoring bit difference: 0x00808000 */
{161, 4, 3},
{161, 4, 3} },
{78750000,
{33, 3, 1},
{66, 3, 2}, /* ignoring bit difference: 0x00008000 */
{110, 5, 2},
{110, 5, 2} },
{80136000,
{28, 5, 0},
{68, 3, 2}, /* ignoring bit difference: 0x00008000 */
{112, 5, 2},
{112, 5, 2} },
{83375000,
{93, 2, 3},
{93, 4, 2}, /* ignoring bit difference: 0x00800000 */
{93, 4, 2}, /* ignoring bit difference: 0x00800000 */
{117, 5, 2} },
{83950000,
{41, 7, 0},
{117, 5, 2}, /* ignoring bit difference: 0x00008000 */
{117, 5, 2},
{117, 5, 2} },
{84750000,
{118, 5, 2},
{118, 5, 2}, /* ignoring bit difference: 0x00808000 */
{118, 5, 2},
{118, 5, 2} },
{85860000,
{84, 7, 1},
{120, 5, 2}, /* ignoring bit difference: 0x00808000 */
{120, 5, 2},
{118, 5, 2} },
{88750000,
{31, 5, 0},
{124, 5, 2}, /* ignoring bit difference: 0x00808000 */
{174, 7, 2}, /* ignoring bit difference: 0x00808000 */
{124, 5, 2} },
{94500000,
{33, 5, 0},
{132, 5, 2}, /* ignoring bit difference: 0x00008000 */
{132, 5, 2},
{132, 5, 2} },
{97750000,
{82, 6, 1},
{137, 5, 2}, /* ignoring bit difference: 0x00808000 */
{137, 5, 2},
{137, 5, 2} },
{101000000,
{127, 9, 1},
{141, 5, 2}, /* ignoring bit difference: 0x00808000 */
{141, 5, 2},
{141, 5, 2} },
{106500000,
{119, 4, 2},
{119, 4, 2}, /* ignoring bit difference: 0x00808000 */
{119, 4, 2},
{149, 5, 2} },
{108000000,
{121, 4, 2},
{121, 4, 2}, /* ignoring bit difference: 0x00808000 */
{151, 5, 2},
{151, 5, 2} },
{113309000,
{95, 12, 0},
{95, 3, 2}, /* ignoring bit difference: 0x00808000 */
{95, 3, 2},
{159, 5, 2} },
{118840000,
{83, 5, 1},
{166, 5, 2}, /* ignoring bit difference: 0x00808000 */
{166, 5, 2},
{166, 5, 2} },
{119000000,
{108, 13, 0},
{133, 4, 2}, /* ignoring bit difference: 0x00808000 */
{133, 4, 2},
{167, 5, 2} },
{121750000,
{85, 5, 1},
{170, 5, 2}, /* ignoring bit difference: 0x00808000 */
{68, 2, 2},
{0, 0, 0} },
{125104000,
{53, 6, 0}, /* ignoring bit difference: 0x00008000 */
{106, 3, 2}, /* ignoring bit difference: 0x00008000 */
{175, 5, 2},
{0, 0, 0} },
{135000000,
{94, 5, 1},
{28, 3, 0}, /* ignoring bit difference: 0x00804000 */
{151, 4, 2},
{189, 5, 2} },
{136700000,
{115, 12, 0},
{191, 5, 2}, /* ignoring bit difference: 0x00808000 */
{191, 5, 2},
{191, 5, 2} },
{138400000,
{87, 9, 0},
{116, 3, 2}, /* ignoring bit difference: 0x00808000 */
{116, 3, 2},
{194, 5, 2} },
{146760000,
{103, 5, 1},
{206, 5, 2}, /* ignoring bit difference: 0x00808000 */
{206, 5, 2},
{206, 5, 2} },
{153920000,
{86, 8, 0},
{86, 4, 1}, /* ignoring bit difference: 0x00808000 */
{86, 4, 1},
{86, 4, 1} }, /* FIXED: old = {84, 2, 1} */
{156000000,
{109, 5, 1},
{109, 5, 1}, /* ignoring bit difference: 0x00808000 */
{109, 5, 1},
{108, 5, 1} },
{157500000,
{55, 5, 0}, /* ignoring bit difference: 0x00008000 */
{22, 2, 0}, /* ignoring bit difference: 0x00802000 */
{110, 5, 1},
{110, 5, 1} },
{162000000,
{113, 5, 1},
{113, 5, 1}, /* ignoring bit difference: 0x00808000 */
{113, 5, 1},
{113, 5, 1} },
{187000000,
{118, 9, 0},
{131, 5, 1}, /* ignoring bit difference: 0x00808000 */
{131, 5, 1},
{131, 5, 1} },
{193295000,
{108, 8, 0},
{81, 3, 1}, /* ignoring bit difference: 0x00808000 */
{135, 5, 1},
{135, 5, 1} },
{202500000,
{99, 7, 0},
{85, 3, 1}, /* ignoring bit difference: 0x00808000 */
{142, 5, 1},
{142, 5, 1} },
{204000000,
{100, 7, 0},
{143, 5, 1}, /* ignoring bit difference: 0x00808000 */
{143, 5, 1},
{143, 5, 1} },
{218500000,
{92, 6, 0},
{153, 5, 1}, /* ignoring bit difference: 0x00808000 */
{153, 5, 1},
{153, 5, 1} },
{234000000,
{98, 6, 0},
{98, 3, 1}, /* ignoring bit difference: 0x00008000 */
{98, 3, 1},
{164, 5, 1} },
{267250000,
{112, 6, 0},
{112, 3, 1}, /* ignoring bit difference: 0x00808000 */
{187, 5, 1},
{187, 5, 1} },
{297500000,
{102, 5, 0}, /* ignoring bit difference: 0x00008000 */
{166, 4, 1}, /* ignoring bit difference: 0x00008000 */
{208, 5, 1},
{208, 5, 1} },
{74481000,
{26, 5, 0},
{125, 3, 3}, /* ignoring bit difference: 0x00808000 */
{208, 5, 3},
{209, 5, 3} },
{172798000,
{121, 5, 1},
{121, 5, 1}, /* ignoring bit difference: 0x00808000 */
{121, 5, 1},
{121, 5, 1} },
{122614000,
{60, 7, 0},
{137, 4, 2}, /* ignoring bit difference: 0x00808000 */
{137, 4, 2},
{172, 5, 2} },
{74270000,
{83, 8, 1},
{208, 5, 3},
{208, 5, 3},
{0, 0, 0} },
{148500000,
{83, 8, 0},
{208, 5, 2},
{166, 4, 2},
{208, 5, 2} }
}; };
static struct fifo_depth_select display_fifo_depth_reg = { static struct fifo_depth_select display_fifo_depth_reg = {
...@@ -1360,40 +1558,70 @@ void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active) ...@@ -1360,40 +1558,70 @@ void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active)
} }
static u32 cle266_encode_pll(struct pll_config pll)
{
return (pll.multiplier << 8)
| (pll.rshift << 6)
| pll.divisor;
}
static u32 k800_encode_pll(struct pll_config pll)
{
return ((pll.divisor - 2) << 16)
| (pll.rshift << 10)
| (pll.multiplier - 2);
}
static u32 vx855_encode_pll(struct pll_config pll)
{
return (pll.divisor << 16)
| (pll.rshift << 10)
| pll.multiplier;
}
u32 viafb_get_clk_value(int clk) u32 viafb_get_clk_value(int clk)
{ {
int i; u32 value = 0;
int i = 0;
for (i = 0; i < NUM_TOTAL_PLL_TABLE; i++) { while (i < NUM_TOTAL_PLL_TABLE && clk != pll_value[i].clk)
if (clk == pll_value[i].clk) { i++;
switch (viaparinfo->chip_info->gfx_chip_name) {
case UNICHROME_CLE266: if (i == NUM_TOTAL_PLL_TABLE) {
case UNICHROME_K400: printk(KERN_WARNING "viafb_get_clk_value: PLL lookup failed!");
return pll_value[i].cle266_pll; } else {
switch (viaparinfo->chip_info->gfx_chip_name) {
case UNICHROME_K800: case UNICHROME_CLE266:
case UNICHROME_PM800: case UNICHROME_K400:
case UNICHROME_CN700: value = cle266_encode_pll(pll_value[i].cle266_pll);
return pll_value[i].k800_pll; break;
case UNICHROME_CX700: case UNICHROME_K800:
case UNICHROME_K8M890: case UNICHROME_PM800:
case UNICHROME_P4M890: case UNICHROME_CN700:
case UNICHROME_P4M900: value = k800_encode_pll(pll_value[i].k800_pll);
case UNICHROME_VX800: break;
return pll_value[i].cx700_pll;
case UNICHROME_VX855: case UNICHROME_CX700:
return pll_value[i].vx855_pll; case UNICHROME_CN750:
} case UNICHROME_K8M890:
case UNICHROME_P4M890:
case UNICHROME_P4M900:
case UNICHROME_VX800:
value = k800_encode_pll(pll_value[i].cx700_pll);
break;
case UNICHROME_VX855:
value = vx855_encode_pll(pll_value[i].vx855_pll);
break;
} }
} }
DEBUG_MSG(KERN_INFO "Can't find match PLL value\n\n"); return value;
return 0;
} }
/* Set VCLK*/ /* Set VCLK*/
void viafb_set_vclock(u32 CLK, int set_iga) void viafb_set_vclock(u32 clk, int set_iga)
{ {
/* H.W. Reset : ON */ /* H.W. Reset : ON */
viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7); viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
...@@ -1403,26 +1631,23 @@ void viafb_set_vclock(u32 CLK, int set_iga) ...@@ -1403,26 +1631,23 @@ void viafb_set_vclock(u32 CLK, int set_iga)
switch (viaparinfo->chip_info->gfx_chip_name) { switch (viaparinfo->chip_info->gfx_chip_name) {
case UNICHROME_CLE266: case UNICHROME_CLE266:
case UNICHROME_K400: case UNICHROME_K400:
viafb_write_reg(SR46, VIASR, CLK / 0x100); via_write_reg(VIASR, SR46, (clk & 0x00FF));
viafb_write_reg(SR47, VIASR, CLK % 0x100); via_write_reg(VIASR, SR47, (clk & 0xFF00) >> 8);
break; break;
case UNICHROME_K800: case UNICHROME_K800:
case UNICHROME_PM800: case UNICHROME_PM800:
case UNICHROME_CN700: case UNICHROME_CN700:
case UNICHROME_CX700: case UNICHROME_CX700:
case UNICHROME_CN750:
case UNICHROME_K8M890: case UNICHROME_K8M890:
case UNICHROME_P4M890: case UNICHROME_P4M890:
case UNICHROME_P4M900: case UNICHROME_P4M900:
case UNICHROME_VX800: case UNICHROME_VX800:
case UNICHROME_VX855: case UNICHROME_VX855:
viafb_write_reg(SR44, VIASR, CLK / 0x10000); via_write_reg(VIASR, SR44, (clk & 0x0000FF));
DEBUG_MSG(KERN_INFO "\nSR44=%x", CLK / 0x10000); via_write_reg(VIASR, SR45, (clk & 0x00FF00) >> 8);
viafb_write_reg(SR45, VIASR, (CLK & 0xFFFF) / 0x100); via_write_reg(VIASR, SR46, (clk & 0xFF0000) >> 16);
DEBUG_MSG(KERN_INFO "\nSR45=%x",
(CLK & 0xFFFF) / 0x100);
viafb_write_reg(SR46, VIASR, CLK % 0x100);
DEBUG_MSG(KERN_INFO "\nSR46=%x", CLK % 0x100);
break; break;
} }
} }
...@@ -1432,22 +1657,23 @@ void viafb_set_vclock(u32 CLK, int set_iga) ...@@ -1432,22 +1657,23 @@ void viafb_set_vclock(u32 CLK, int set_iga)
switch (viaparinfo->chip_info->gfx_chip_name) { switch (viaparinfo->chip_info->gfx_chip_name) {
case UNICHROME_CLE266: case UNICHROME_CLE266:
case UNICHROME_K400: case UNICHROME_K400:
viafb_write_reg(SR44, VIASR, CLK / 0x100); via_write_reg(VIASR, SR44, (clk & 0x00FF));
viafb_write_reg(SR45, VIASR, CLK % 0x100); via_write_reg(VIASR, SR45, (clk & 0xFF00) >> 8);
break; break;
case UNICHROME_K800: case UNICHROME_K800:
case UNICHROME_PM800: case UNICHROME_PM800:
case UNICHROME_CN700: case UNICHROME_CN700:
case UNICHROME_CX700: case UNICHROME_CX700:
case UNICHROME_CN750:
case UNICHROME_K8M890: case UNICHROME_K8M890:
case UNICHROME_P4M890: case UNICHROME_P4M890:
case UNICHROME_P4M900: case UNICHROME_P4M900:
case UNICHROME_VX800: case UNICHROME_VX800:
case UNICHROME_VX855: case UNICHROME_VX855:
viafb_write_reg(SR4A, VIASR, CLK / 0x10000); via_write_reg(VIASR, SR4A, (clk & 0x0000FF));
viafb_write_reg(SR4B, VIASR, (CLK & 0xFFFF) / 0x100); via_write_reg(VIASR, SR4B, (clk & 0x00FF00) >> 8);
viafb_write_reg(SR4C, VIASR, CLK % 0x100); via_write_reg(VIASR, SR4C, (clk & 0xFF0000) >> 16);
break; break;
} }
} }
...@@ -1791,8 +2017,6 @@ void viafb_init_chip_info(int chip_type) ...@@ -1791,8 +2017,6 @@ void viafb_init_chip_info(int chip_type)
viafb_set_iga_path(); viafb_set_iga_path();
viaparinfo->lvds_setting_info->display_method = viafb_lcd_dsp_method; viaparinfo->lvds_setting_info->display_method = viafb_lcd_dsp_method;
viaparinfo->lvds_setting_info->get_lcd_size_method =
GET_LCD_SIZE_BY_USER_SETTING;
viaparinfo->lvds_setting_info->lcd_mode = viafb_lcd_mode; viaparinfo->lvds_setting_info->lcd_mode = viafb_lcd_mode;
viaparinfo->lvds_setting_info2->display_method = viaparinfo->lvds_setting_info2->display_method =
viaparinfo->lvds_setting_info->display_method; viaparinfo->lvds_setting_info->display_method;
...@@ -1946,13 +2170,6 @@ static void init_tmds_chip_info(void) ...@@ -1946,13 +2170,6 @@ static void init_tmds_chip_info(void)
static void init_lvds_chip_info(void) static void init_lvds_chip_info(void)
{ {
if (viafb_lcd_panel_id > LCD_PANEL_ID_MAXIMUM)
viaparinfo->lvds_setting_info->get_lcd_size_method =
GET_LCD_SIZE_BY_VGA_BIOS;
else
viaparinfo->lvds_setting_info->get_lcd_size_method =
GET_LCD_SIZE_BY_USER_SETTING;
viafb_lvds_trasmitter_identify(); viafb_lvds_trasmitter_identify();
viafb_init_lcd_size(); viafb_init_lcd_size();
viafb_init_lvds_output_interface(&viaparinfo->chip_info->lvds_chip_info, viafb_init_lvds_output_interface(&viaparinfo->chip_info->lvds_chip_info,
......
drivers/video/via/hw.h
View file @ c5f34757
...@@ -700,12 +700,18 @@ struct _lcd_scaling_factor { ...@@ -700,12 +700,18 @@ struct _lcd_scaling_factor {
struct _lcd_ver_scaling_factor lcd_ver_scaling_factor; struct _lcd_ver_scaling_factor lcd_ver_scaling_factor;
}; };
struct pll_config {
u16 multiplier;
u8 divisor;
u8 rshift;
};
struct pll_map { struct pll_map {
u32 clk; u32 clk;
u32 cle266_pll; struct pll_config cle266_pll;
u32 k800_pll; struct pll_config k800_pll;
u32 cx700_pll; struct pll_config cx700_pll;
u32 vx855_pll; struct pll_config vx855_pll;
}; };
struct rgbLUT { struct rgbLUT {
......
drivers/video/via/ioctl.h
View file @ c5f34757
...@@ -35,11 +35,9 @@ ...@@ -35,11 +35,9 @@
#define VIAFB_GET_SAMM_INFO 0x56494107 /* 'VIA\07' */ #define VIAFB_GET_SAMM_INFO 0x56494107 /* 'VIA\07' */
#define VIAFB_TURN_ON_OUTPUT_DEVICE 0x56494108 /* 'VIA\08' */ #define VIAFB_TURN_ON_OUTPUT_DEVICE 0x56494108 /* 'VIA\08' */
#define VIAFB_TURN_OFF_OUTPUT_DEVICE 0x56494109 /* 'VIA\09' */ #define VIAFB_TURN_OFF_OUTPUT_DEVICE 0x56494109 /* 'VIA\09' */
#define VIAFB_SET_DEVICE 0x5649410A
#define VIAFB_GET_DEVICE 0x5649410B #define VIAFB_GET_DEVICE 0x5649410B
#define VIAFB_GET_DRIVER_VERSION 0x56494112 /* 'VIA\12' */ #define VIAFB_GET_DRIVER_VERSION 0x56494112 /* 'VIA\12' */
#define VIAFB_GET_CHIP_INFO 0x56494113 /* 'VIA\13' */ #define VIAFB_GET_CHIP_INFO 0x56494113 /* 'VIA\13' */
#define VIAFB_SET_DEVICE_INFO 0x56494114
#define VIAFB_GET_DEVICE_INFO 0x56494115 #define VIAFB_GET_DEVICE_INFO 0x56494115
#define VIAFB_GET_DEVICE_SUPPORT 0x56494118 #define VIAFB_GET_DEVICE_SUPPORT 0x56494118
...@@ -50,7 +48,6 @@ ...@@ -50,7 +48,6 @@
#define VIAFB_GET_GAMMA_LUT 0x56494124 #define VIAFB_GET_GAMMA_LUT 0x56494124
#define VIAFB_SET_GAMMA_LUT 0x56494125 #define VIAFB_SET_GAMMA_LUT 0x56494125
#define VIAFB_GET_GAMMA_SUPPORT_STATE 0x56494126 #define VIAFB_GET_GAMMA_SUPPORT_STATE 0x56494126
#define VIAFB_SET_SECOND_MODE 0x56494129
#define VIAFB_SYNC_SURFACE 0x56494130 #define VIAFB_SYNC_SURFACE 0x56494130
#define VIAFB_GET_DRIVER_CAPS 0x56494131 #define VIAFB_GET_DRIVER_CAPS 0x56494131
#define VIAFB_GET_IGA_SCALING_INFO 0x56494132 #define VIAFB_GET_IGA_SCALING_INFO 0x56494132
......
drivers/video/via/lcd.c
View file @ c5f34757
...@@ -75,8 +75,6 @@ static void check_diport_of_integrated_lvds( ...@@ -75,8 +75,6 @@ static void check_diport_of_integrated_lvds(
static struct display_timing lcd_centering_timging(struct display_timing static struct display_timing lcd_centering_timging(struct display_timing
mode_crt_reg, mode_crt_reg,
struct display_timing panel_crt_reg); struct display_timing panel_crt_reg);
static void viafb_load_scaling_factor_for_p4m900(int set_hres,
int set_vres, int panel_hres, int panel_vres);
static int check_lvds_chip(int device_id_subaddr, int device_id) static int check_lvds_chip(int device_id_subaddr, int device_id)
{ {
...@@ -89,33 +87,8 @@ static int check_lvds_chip(int device_id_subaddr, int device_id) ...@@ -89,33 +87,8 @@ static int check_lvds_chip(int device_id_subaddr, int device_id)
void viafb_init_lcd_size(void) void viafb_init_lcd_size(void)
{ {
DEBUG_MSG(KERN_INFO "viafb_init_lcd_size()\n"); DEBUG_MSG(KERN_INFO "viafb_init_lcd_size()\n");
DEBUG_MSG(KERN_INFO
"viaparinfo->lvds_setting_info->get_lcd_size_method %d\n",
viaparinfo->lvds_setting_info->get_lcd_size_method);
switch (viaparinfo->lvds_setting_info->get_lcd_size_method) { fp_id_to_vindex(viafb_lcd_panel_id);
case GET_LCD_SIZE_BY_SYSTEM_BIOS:
break;
case GET_LCD_SZIE_BY_HW_STRAPPING:
break;
case GET_LCD_SIZE_BY_VGA_BIOS:
DEBUG_MSG(KERN_INFO "Get LCD Size method by VGA BIOS !!\n");
fp_id_to_vindex(viafb_lcd_panel_id);
DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n",
viaparinfo->lvds_setting_info->lcd_panel_id);
break;
case GET_LCD_SIZE_BY_USER_SETTING:
DEBUG_MSG(KERN_INFO "Get LCD Size method by user setting !!\n");
fp_id_to_vindex(viafb_lcd_panel_id);
DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n",
viaparinfo->lvds_setting_info->lcd_panel_id);
break;
default:
DEBUG_MSG(KERN_INFO "viafb_init_lcd_size fail\n");
viaparinfo->lvds_setting_info->lcd_panel_id =
LCD_PANEL_ID1_800X600;
fp_id_to_vindex(LCD_PANEL_ID1_800X600);
}
viaparinfo->lvds_setting_info2->lcd_panel_id = viaparinfo->lvds_setting_info2->lcd_panel_id =
viaparinfo->lvds_setting_info->lcd_panel_id; viaparinfo->lvds_setting_info->lcd_panel_id;
viaparinfo->lvds_setting_info2->lcd_panel_hres = viaparinfo->lvds_setting_info2->lcd_panel_hres =
...@@ -437,14 +410,9 @@ static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres, ...@@ -437,14 +410,9 @@ static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,
/* LCD Scaling Enable */ /* LCD Scaling Enable */
viafb_write_reg_mask(CR79, VIACR, 0x07, BIT0 + BIT1 + BIT2); viafb_write_reg_mask(CR79, VIACR, 0x07, BIT0 + BIT1 + BIT2);
if (UNICHROME_P4M900 == viaparinfo->chip_info->gfx_chip_name) {
viafb_load_scaling_factor_for_p4m900(set_hres, set_vres,
panel_hres, panel_vres);
return;
}
/* Check if expansion for horizontal */ /* Check if expansion for horizontal */
if (set_hres != panel_hres) { if (set_hres < panel_hres) {
/* Load Horizontal Scaling Factor */ /* Load Horizontal Scaling Factor */
switch (viaparinfo->chip_info->gfx_chip_name) { switch (viaparinfo->chip_info->gfx_chip_name) {
case UNICHROME_CLE266: case UNICHROME_CLE266:
...@@ -464,6 +432,10 @@ static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres, ...@@ -464,6 +432,10 @@ static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,
case UNICHROME_CX700: case UNICHROME_CX700:
case UNICHROME_K8M890: case UNICHROME_K8M890:
case UNICHROME_P4M890: case UNICHROME_P4M890:
case UNICHROME_P4M900:
case UNICHROME_CN750:
case UNICHROME_VX800:
case UNICHROME_VX855:
reg_value = reg_value =
K800_LCD_HOR_SCF_FORMULA(set_hres, panel_hres); K800_LCD_HOR_SCF_FORMULA(set_hres, panel_hres);
/* Horizontal scaling enabled */ /* Horizontal scaling enabled */
...@@ -483,7 +455,7 @@ static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres, ...@@ -483,7 +455,7 @@ static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,
} }
/* Check if expansion for vertical */ /* Check if expansion for vertical */
if (set_vres != panel_vres) { if (set_vres < panel_vres) {
/* Load Vertical Scaling Factor */ /* Load Vertical Scaling Factor */
switch (viaparinfo->chip_info->gfx_chip_name) { switch (viaparinfo->chip_info->gfx_chip_name) {
case UNICHROME_CLE266: case UNICHROME_CLE266:
...@@ -503,6 +475,10 @@ static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres, ...@@ -503,6 +475,10 @@ static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,
case UNICHROME_CX700: case UNICHROME_CX700:
case UNICHROME_K8M890: case UNICHROME_K8M890:
case UNICHROME_P4M890: case UNICHROME_P4M890:
case UNICHROME_P4M900:
case UNICHROME_CN750:
case UNICHROME_VX800:
case UNICHROME_VX855:
reg_value = reg_value =
K800_LCD_VER_SCF_FORMULA(set_vres, panel_vres); K800_LCD_VER_SCF_FORMULA(set_vres, panel_vres);
/* Vertical scaling enabled */ /* Vertical scaling enabled */
...@@ -648,9 +624,8 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table, ...@@ -648,9 +624,8 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,
(mode_crt_reg, panel_crt_reg), IGA1); (mode_crt_reg, panel_crt_reg), IGA1);
} else { } else {
/* Expansion */ /* Expansion */
if ((plvds_setting_info->display_method == if (plvds_setting_info->display_method == LCD_EXPANDSION
LCD_EXPANDSION) & ((set_hres != panel_hres) && (set_hres < panel_hres || set_vres < panel_vres)) {
|| (set_vres != panel_vres))) {
/* expansion timing IGA2 loaded panel set timing*/ /* expansion timing IGA2 loaded panel set timing*/
viafb_load_crtc_timing(panel_crt_reg, IGA2); viafb_load_crtc_timing(panel_crt_reg, IGA2);
DEBUG_MSG(KERN_INFO "viafb_load_crtc_timing!!\n"); DEBUG_MSG(KERN_INFO "viafb_load_crtc_timing!!\n");
...@@ -1139,69 +1114,3 @@ bool viafb_lcd_get_mobile_state(bool *mobile) ...@@ -1139,69 +1114,3 @@ bool viafb_lcd_get_mobile_state(bool *mobile)
return false; return false;
} }
} }
static void viafb_load_scaling_factor_for_p4m900(int set_hres,
int set_vres, int panel_hres, int panel_vres)
{
int h_scaling_factor;
int v_scaling_factor;
u8 cra2 = 0;
u8 cr77 = 0;
u8 cr78 = 0;
u8 cr79 = 0;
u8 cr9f = 0;
/* Check if expansion for horizontal */
if (set_hres < panel_hres) {
/* Load Horizontal Scaling Factor */
/* For VIA_K8M800 or later chipsets. */
h_scaling_factor =
K800_LCD_HOR_SCF_FORMULA(set_hres, panel_hres);
/* HSCaleFactor[1:0] at CR9F[1:0] */
cr9f = h_scaling_factor & 0x0003;
/* HSCaleFactor[9:2] at CR77[7:0] */
cr77 = (h_scaling_factor & 0x03FC) >> 2;
/* HSCaleFactor[11:10] at CR79[5:4] */
cr79 = (h_scaling_factor & 0x0C00) >> 10;
cr79 <<= 4;
/* Horizontal scaling enabled */
cra2 = 0xC0;
DEBUG_MSG(KERN_INFO "Horizontal Scaling value = %d\n",
h_scaling_factor);
} else {
/* Horizontal scaling disabled */
cra2 = 0x00;
}
/* Check if expansion for vertical */
if (set_vres < panel_vres) {
/* Load Vertical Scaling Factor */
/* For VIA_K8M800 or later chipsets. */
v_scaling_factor =
K800_LCD_VER_SCF_FORMULA(set_vres, panel_vres);
/* Vertical scaling enabled */
cra2 |= 0x08;
/* VSCaleFactor[0] at CR79[3] */
cr79 |= ((v_scaling_factor & 0x0001) << 3);
/* VSCaleFactor[8:1] at CR78[7:0] */
cr78 |= (v_scaling_factor & 0x01FE) >> 1;
/* VSCaleFactor[10:9] at CR79[7:6] */
cr79 |= ((v_scaling_factor & 0x0600) >> 9) << 6;
DEBUG_MSG(KERN_INFO "Vertical Scaling value = %d\n",
v_scaling_factor);
} else {
/* Vertical scaling disabled */
cra2 |= 0x00;
}
viafb_write_reg_mask(CRA2, VIACR, cra2, BIT3 + BIT6 + BIT7);
viafb_write_reg_mask(CR77, VIACR, cr77, 0xFF);
viafb_write_reg_mask(CR78, VIACR, cr78, 0xFF);
viafb_write_reg_mask(CR79, VIACR, cr79, 0xF8);
viafb_write_reg_mask(CR9F, VIACR, cr9f, BIT0 + BIT1);
}
drivers/video/via/lcd.h
View file @ c5f34757
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
#define VT3271_DEVICE_ID_REG 0x02 #define VT3271_DEVICE_ID_REG 0x02
#define VT3271_DEVICE_ID 0x71 #define VT3271_DEVICE_ID 0x71
#define GET_LCD_SIZE_BY_SYSTEM_BIOS 0x01
#define GET_LCD_SIZE_BY_VGA_BIOS 0x02
#define GET_LCD_SZIE_BY_HW_STRAPPING 0x03
#define GET_LCD_SIZE_BY_USER_SETTING 0x04
/* Definition DVI Panel ID*/ /* Definition DVI Panel ID*/
/* Resolution: 640x480, Channel: single, Dithering: Enable */ /* Resolution: 640x480, Channel: single, Dithering: Enable */
#define LCD_PANEL_ID0_640X480 0x00 #define LCD_PANEL_ID0_640X480 0x00
......
drivers/video/via/share.h
View file @ c5f34757
...@@ -631,7 +631,6 @@ ...@@ -631,7 +631,6 @@
#define CLK_25_175M 25175000 #define CLK_25_175M 25175000
#define CLK_26_880M 26880000 #define CLK_26_880M 26880000
#define CLK_29_581M 29581000 #define CLK_29_581M 29581000
#define CLK_31_490M 31490000
#define CLK_31_500M 31500000 #define CLK_31_500M 31500000
#define CLK_31_728M 31728000 #define CLK_31_728M 31728000
#define CLK_32_668M 32688000 #define CLK_32_668M 32688000
...@@ -676,7 +675,6 @@ ...@@ -676,7 +675,6 @@
#define CLK_119_000M 119000000 #define CLK_119_000M 119000000
#define CLK_121_750M 121750000 /* 121.704MHz */ #define CLK_121_750M 121750000 /* 121.704MHz */
#define CLK_125_104M 125104000 #define CLK_125_104M 125104000
#define CLK_133_308M 133308000
#define CLK_135_000M 135000000 #define CLK_135_000M 135000000
#define CLK_136_700M 136700000 #define CLK_136_700M 136700000
#define CLK_138_400M 138400000 #define CLK_138_400M 138400000
...@@ -699,313 +697,6 @@ ...@@ -699,313 +697,6 @@
#define CLK_172_798M 172798000 #define CLK_172_798M 172798000
#define CLK_122_614M 122614000 #define CLK_122_614M 122614000
/* CLE266 PLL value
*/
#define CLE266_PLL_25_175M 0x0000C763
#define CLE266_PLL_26_880M 0x0000440F
#define CLE266_PLL_29_581M 0x00008421
#define CLE266_PLL_31_490M 0x00004721
#define CLE266_PLL_31_500M 0x0000C3B5
#define CLE266_PLL_31_728M 0x0000471F
#define CLE266_PLL_32_668M 0x0000C449
#define CLE266_PLL_36_000M 0x0000C5E5
#define CLE266_PLL_40_000M 0x0000C459
#define CLE266_PLL_41_291M 0x00004417
#define CLE266_PLL_43_163M 0x0000C579
#define CLE266_PLL_45_250M 0x0000C57F /* 45.46MHz */
#define CLE266_PLL_46_000M 0x0000875A
#define CLE266_PLL_46_996M 0x0000C4E9
#define CLE266_PLL_48_000M 0x00001443
#define CLE266_PLL_48_875M 0x00001D63
#define CLE266_PLL_49_500M 0x00008653
#define CLE266_PLL_52_406M 0x0000C475
#define CLE266_PLL_52_977M 0x00004525
#define CLE266_PLL_56_250M 0x000047B7
#define CLE266_PLL_60_466M 0x0000494C
#define CLE266_PLL_61_500M 0x00001456
#define CLE266_PLL_65_000M 0x000086ED
#define CLE266_PLL_65_178M 0x0000855B
#define CLE266_PLL_66_750M 0x0000844B /* 67.116MHz */
#define CLE266_PLL_68_179M 0x00000413
#define CLE266_PLL_69_924M 0x00001153
#define CLE266_PLL_70_159M 0x00001462
#define CLE266_PLL_72_000M 0x00001879
#define CLE266_PLL_74_270M 0x00004853
#define CLE266_PLL_78_750M 0x00004321
#define CLE266_PLL_80_136M 0x0000051C
#define CLE266_PLL_83_375M 0x0000C25D
#define CLE266_PLL_83_950M 0x00000729
#define CLE266_PLL_84_750M 0x00008576 /* 84.537MHz */
#define CLE266_PLL_85_860M 0x00004754
#define CLE266_PLL_88_750M 0x0000051F
#define CLE266_PLL_94_500M 0x00000521
#define CLE266_PLL_97_750M 0x00004652
#define CLE266_PLL_101_000M 0x0000497F
#define CLE266_PLL_106_500M 0x00008477 /* 106.491463 MHz */
#define CLE266_PLL_108_000M 0x00008479
#define CLE266_PLL_113_309M 0x00000C5F
#define CLE266_PLL_118_840M 0x00004553
#define CLE266_PLL_119_000M 0x00000D6C
#define CLE266_PLL_121_750M 0x00004555 /* 121.704MHz */
#define CLE266_PLL_125_104M 0x000006B5
#define CLE266_PLL_133_308M 0x0000465F
#define CLE266_PLL_135_000M 0x0000455E
#define CLE266_PLL_136_700M 0x00000C73
#define CLE266_PLL_138_400M 0x00000957
#define CLE266_PLL_146_760M 0x00004567
#define CLE266_PLL_148_500M 0x00000853
#define CLE266_PLL_153_920M 0x00000856
#define CLE266_PLL_156_000M 0x0000456D
#define CLE266_PLL_157_500M 0x000005B7
#define CLE266_PLL_162_000M 0x00004571
#define CLE266_PLL_187_000M 0x00000976
#define CLE266_PLL_193_295M 0x0000086C
#define CLE266_PLL_202_500M 0x00000763
#define CLE266_PLL_204_000M 0x00000764
#define CLE266_PLL_218_500M 0x0000065C
#define CLE266_PLL_234_000M 0x00000662
#define CLE266_PLL_267_250M 0x00000670
#define CLE266_PLL_297_500M 0x000005E6
#define CLE266_PLL_74_481M 0x0000051A
#define CLE266_PLL_172_798M 0x00004579
#define CLE266_PLL_122_614M 0x0000073C
/* K800 PLL value
*/
#define K800_PLL_25_175M 0x00539001
#define K800_PLL_26_880M 0x001C8C80
#define K800_PLL_29_581M 0x00409080
#define K800_PLL_31_490M 0x006F9001
#define K800_PLL_31_500M 0x008B9002
#define K800_PLL_31_728M 0x00AF9003
#define K800_PLL_32_668M 0x00909002
#define K800_PLL_36_000M 0x009F9002
#define K800_PLL_40_000M 0x00578C02
#define K800_PLL_41_291M 0x00438C01
#define K800_PLL_43_163M 0x00778C03
#define K800_PLL_45_250M 0x007D8C83 /* 45.46MHz */
#define K800_PLL_46_000M 0x00658C02
#define K800_PLL_46_996M 0x00818C83
#define K800_PLL_48_000M 0x00848C83
#define K800_PLL_48_875M 0x00508C81
#define K800_PLL_49_500M 0x00518C01
#define K800_PLL_52_406M 0x00738C02
#define K800_PLL_52_977M 0x00928C83
#define K800_PLL_56_250M 0x007C8C02
#define K800_PLL_60_466M 0x00A78C83
#define K800_PLL_61_500M 0x00AA8C83
#define K800_PLL_65_000M 0x006B8C01
#define K800_PLL_65_178M 0x00B48C83
#define K800_PLL_66_750M 0x00948C82 /* 67.116MHz */
#define K800_PLL_68_179M 0x00708C01
#define K800_PLL_69_924M 0x00C18C83
#define K800_PLL_70_159M 0x00C28C83
#define K800_PLL_72_000M 0x009F8C82
#define K800_PLL_74_270M 0x00ce0c03
#define K800_PLL_78_750M 0x00408801
#define K800_PLL_80_136M 0x00428801
#define K800_PLL_83_375M 0x005B0882
#define K800_PLL_83_950M 0x00738803
#define K800_PLL_84_750M 0x00748883 /* 84.477MHz */
#define K800_PLL_85_860M 0x00768883
#define K800_PLL_88_750M 0x007A8883
#define K800_PLL_94_500M 0x00828803
#define K800_PLL_97_750M 0x00878883
#define K800_PLL_101_000M 0x008B8883
#define K800_PLL_106_500M 0x00758882 /* 106.491463 MHz */
#define K800_PLL_108_000M 0x00778882
#define K800_PLL_113_309M 0x005D8881
#define K800_PLL_118_840M 0x00A48883
#define K800_PLL_119_000M 0x00838882
#define K800_PLL_121_750M 0x00A88883 /* 121.704MHz */
#define K800_PLL_125_104M 0x00688801
#define K800_PLL_133_308M 0x005D8801
#define K800_PLL_135_000M 0x001A4081
#define K800_PLL_136_700M 0x00BD8883
#define K800_PLL_138_400M 0x00728881
#define K800_PLL_146_760M 0x00CC8883
#define K800_PLL_148_500M 0x00ce0803
#define K800_PLL_153_920M 0x00548482
#define K800_PLL_156_000M 0x006B8483
#define K800_PLL_157_500M 0x00142080
#define K800_PLL_162_000M 0x006F8483
#define K800_PLL_187_000M 0x00818483
#define K800_PLL_193_295M 0x004F8481
#define K800_PLL_202_500M 0x00538481
#define K800_PLL_204_000M 0x008D8483
#define K800_PLL_218_500M 0x00978483
#define K800_PLL_234_000M 0x00608401
#define K800_PLL_267_250M 0x006E8481
#define K800_PLL_297_500M 0x00A48402
#define K800_PLL_74_481M 0x007B8C81
#define K800_PLL_172_798M 0x00778483
#define K800_PLL_122_614M 0x00878882
/* PLL for VT3324 */
#define CX700_25_175M 0x008B1003
#define CX700_26_719M 0x00931003
#define CX700_26_880M 0x00941003
#define CX700_29_581M 0x00A49003
#define CX700_31_490M 0x00AE1003
#define CX700_31_500M 0x00AE1003
#define CX700_31_728M 0x00AF1003
#define CX700_32_668M 0x00B51003
#define CX700_36_000M 0x00C81003
#define CX700_40_000M 0x006E0C03
#define CX700_41_291M 0x00710C03
#define CX700_43_163M 0x00770C03
#define CX700_45_250M 0x007D0C03 /* 45.46MHz */
#define CX700_46_000M 0x007F0C03
#define CX700_46_996M 0x00818C83
#define CX700_48_000M 0x00840C03
#define CX700_48_875M 0x00508C81
#define CX700_49_500M 0x00880C03
#define CX700_52_406M 0x00730C02
#define CX700_52_977M 0x00920C03
#define CX700_56_250M 0x009B0C03
#define CX700_60_466M 0x00460C00
#define CX700_61_500M 0x00AA0C03
#define CX700_65_000M 0x006B0C01
#define CX700_65_178M 0x006B0C01
#define CX700_66_750M 0x00940C02 /*67.116MHz */
#define CX700_68_179M 0x00BC0C03
#define CX700_69_924M 0x00C10C03
#define CX700_70_159M 0x00C20C03
#define CX700_72_000M 0x009F0C02
#define CX700_74_270M 0x00CE0C03
#define CX700_74_481M 0x00CE0C03
#define CX700_78_750M 0x006C0803
#define CX700_80_136M 0x006E0803
#define CX700_83_375M 0x005B0882
#define CX700_83_950M 0x00730803
#define CX700_84_750M 0x00740803 /* 84.537Mhz */
#define CX700_85_860M 0x00760803
#define CX700_88_750M 0x00AC8885
#define CX700_94_500M 0x00820803
#define CX700_97_750M 0x00870803
#define CX700_101_000M 0x008B0803
#define CX700_106_500M 0x00750802
#define CX700_108_000M 0x00950803
#define CX700_113_309M 0x005D0801
#define CX700_118_840M 0x00A40803
#define CX700_119_000M 0x00830802
#define CX700_121_750M 0x00420800 /* 121.704MHz */
#define CX700_125_104M 0x00AD0803
#define CX700_133_308M 0x00930802
#define CX700_135_000M 0x00950802
#define CX700_136_700M 0x00BD0803
#define CX700_138_400M 0x00720801
#define CX700_146_760M 0x00CC0803
#define CX700_148_500M 0x00a40802
#define CX700_153_920M 0x00540402
#define CX700_156_000M 0x006B0403
#define CX700_157_500M 0x006C0403
#define CX700_162_000M 0x006F0403
#define CX700_172_798M 0x00770403
#define CX700_187_000M 0x00810403
#define CX700_193_295M 0x00850403
#define CX700_202_500M 0x008C0403
#define CX700_204_000M 0x008D0403
#define CX700_218_500M 0x00970403
#define CX700_234_000M 0x00600401
#define CX700_267_250M 0x00B90403
#define CX700_297_500M 0x00CE0403
#define CX700_122_614M 0x00870802
/* PLL for VX855 */
#define VX855_22_000M 0x007B1005
#define VX855_25_175M 0x008D1005
#define VX855_26_719M 0x00961005
#define VX855_26_880M 0x00961005
#define VX855_27_000M 0x00971005
#define VX855_29_581M 0x00A51005
#define VX855_29_829M 0x00641003
#define VX855_31_490M 0x00B01005
#define VX855_31_500M 0x00B01005
#define VX855_31_728M 0x008E1004
#define VX855_32_668M 0x00921004
#define VX855_36_000M 0x00A11004
#define VX855_40_000M 0x00700C05
#define VX855_41_291M 0x00730C05
#define VX855_43_163M 0x00790C05
#define VX855_45_250M 0x007F0C05 /* 45.46MHz */
#define VX855_46_000M 0x00670C04
#define VX855_46_996M 0x00690C04
#define VX855_48_000M 0x00860C05
#define VX855_48_875M 0x00890C05
#define VX855_49_500M 0x00530C03
#define VX855_52_406M 0x00580C03
#define VX855_52_977M 0x00940C05
#define VX855_56_250M 0x009D0C05
#define VX855_57_275M 0x009D8C85 /* Used by XO panel */
#define VX855_60_466M 0x00A90C05
#define VX855_61_500M 0x00AC0C05
#define VX855_65_000M 0x006D0C03
#define VX855_65_178M 0x00B60C05
#define VX855_66_750M 0x00700C03 /*67.116MHz */
#define VX855_67_295M 0x00BC0C05
#define VX855_68_179M 0x00BF0C05
#define VX855_68_369M 0x00BF0C05
#define VX855_69_924M 0x00C30C05
#define VX855_70_159M 0x00C30C05
#define VX855_72_000M 0x00A10C04
#define VX855_73_023M 0x00CC0C05
#define VX855_74_481M 0x00D10C05
#define VX855_78_750M 0x006E0805
#define VX855_79_466M 0x006F0805
#define VX855_80_136M 0x00700805
#define VX855_81_627M 0x00720805
#define VX855_83_375M 0x00750805
#define VX855_83_527M 0x00750805
#define VX855_83_950M 0x00750805
#define VX855_84_537M 0x00760805
#define VX855_84_750M 0x00760805 /* 84.537Mhz */
#define VX855_85_500M 0x00760805 /* 85.909080 MHz*/
#define VX855_85_860M 0x00760805
#define VX855_85_909M 0x00760805
#define VX855_88_750M 0x007C0805
#define VX855_89_489M 0x007D0805
#define VX855_94_500M 0x00840805
#define VX855_96_648M 0x00870805
#define VX855_97_750M 0x00890805
#define VX855_101_000M 0x008D0805
#define VX855_106_500M 0x00950805
#define VX855_108_000M 0x00970805
#define VX855_110_125M 0x00990805
#define VX855_112_000M 0x009D0805
#define VX855_113_309M 0x009F0805
#define VX855_115_000M 0x00A10805
#define VX855_118_840M 0x00A60805
#define VX855_119_000M 0x00A70805
#define VX855_121_750M 0x00AA0805 /* 121.704MHz */
#define VX855_122_614M 0x00AC0805
#define VX855_126_266M 0x00B10805
#define VX855_130_250M 0x00B60805 /* 130.250 */
#define VX855_135_000M 0x00BD0805
#define VX855_136_700M 0x00BF0805
#define VX855_137_750M 0x00C10805
#define VX855_138_400M 0x00C20805
#define VX855_144_300M 0x00CA0805
#define VX855_146_760M 0x00CE0805
#define VX855_148_500M 0x00D00805
#define VX855_153_920M 0x00540402
#define VX855_156_000M 0x006C0405
#define VX855_156_867M 0x006E0405
#define VX855_157_500M 0x006E0405
#define VX855_162_000M 0x00710405
#define VX855_172_798M 0x00790405
#define VX855_187_000M 0x00830405
#define VX855_193_295M 0x00870405
#define VX855_202_500M 0x008E0405
#define VX855_204_000M 0x008F0405
#define VX855_218_500M 0x00990405
#define VX855_229_500M 0x00A10405
#define VX855_234_000M 0x00A40405
#define VX855_267_250M 0x00BB0405
#define VX855_297_500M 0x00D00405
#define VX855_339_500M 0x00770005
#define VX855_340_772M 0x00770005
/* Definition CRTC Timing Index */ /* Definition CRTC Timing Index */
#define H_TOTAL_INDEX 0 #define H_TOTAL_INDEX 0
......
drivers/video/via/via-core.c
View file @ c5f34757
...@@ -64,7 +64,7 @@ static inline int viafb_mmio_read(int reg) ...@@ -64,7 +64,7 @@ static inline int viafb_mmio_read(int reg)
*/ */
static u32 viafb_enabled_ints; static u32 viafb_enabled_ints;
static void viafb_int_init(void) static void __devinit viafb_int_init(void)
{ {
viafb_enabled_ints = 0; viafb_enabled_ints = 0;
...@@ -489,7 +489,7 @@ static int __devinit via_pci_setup_mmio(struct viafb_dev *vdev) ...@@ -489,7 +489,7 @@ static int __devinit via_pci_setup_mmio(struct viafb_dev *vdev)
return ret; return ret;
} }
static void __devexit via_pci_teardown_mmio(struct viafb_dev *vdev) static void via_pci_teardown_mmio(struct viafb_dev *vdev)
{ {
iounmap(vdev->fbmem); iounmap(vdev->fbmem);
iounmap(vdev->engine_mmio); iounmap(vdev->engine_mmio);
...@@ -548,7 +548,7 @@ static int __devinit via_setup_subdevs(struct viafb_dev *vdev) ...@@ -548,7 +548,7 @@ static int __devinit via_setup_subdevs(struct viafb_dev *vdev)
return 0; return 0;
} }
static void __devexit via_teardown_subdevs(void) static void via_teardown_subdevs(void)
{ {
int i; int i;
...@@ -613,22 +613,24 @@ static void __devexit via_pci_remove(struct pci_dev *pdev) ...@@ -613,22 +613,24 @@ static void __devexit via_pci_remove(struct pci_dev *pdev)
static struct pci_device_id via_pci_table[] __devinitdata = { static struct pci_device_id via_pci_table[] __devinitdata = {
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CLE266_DID), { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CLE266_DID),
.driver_data = UNICHROME_CLE266 }, .driver_data = UNICHROME_CLE266 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_PM800_DID),
.driver_data = UNICHROME_PM800 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K400_DID), { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K400_DID),
.driver_data = UNICHROME_K400 }, .driver_data = UNICHROME_K400 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K800_DID), { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K800_DID),
.driver_data = UNICHROME_K800 }, .driver_data = UNICHROME_K800 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_P4M890_DID), { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_PM800_DID),
.driver_data = UNICHROME_PM800 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CN700_DID),
.driver_data = UNICHROME_CN700 }, .driver_data = UNICHROME_CN700 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K8M890_DID),
.driver_data = UNICHROME_K8M890 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CX700_DID), { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CX700_DID),
.driver_data = UNICHROME_CX700 }, .driver_data = UNICHROME_CX700 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_P4M900_DID),
.driver_data = UNICHROME_P4M900 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CN750_DID), { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CN750_DID),
.driver_data = UNICHROME_CN750 }, .driver_data = UNICHROME_CN750 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K8M890_DID),
.driver_data = UNICHROME_K8M890 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_P4M890_DID),
.driver_data = UNICHROME_P4M890 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_P4M900_DID),
.driver_data = UNICHROME_P4M900 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_VX800_DID), { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_VX800_DID),
.driver_data = UNICHROME_VX800 }, .driver_data = UNICHROME_VX800 },
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_VX855_DID), { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_VX855_DID),
......
drivers/video/via/via-gpio.c
View file @ c5f34757
...@@ -73,7 +73,7 @@ struct viafb_gpio_cfg { ...@@ -73,7 +73,7 @@ struct viafb_gpio_cfg {
struct gpio_chip gpio_chip; struct gpio_chip gpio_chip;
struct viafb_dev *vdev; struct viafb_dev *vdev;
struct viafb_gpio *active_gpios[VIAFB_NUM_GPIOS]; struct viafb_gpio *active_gpios[VIAFB_NUM_GPIOS];
char *gpio_names[VIAFB_NUM_GPIOS]; const char *gpio_names[VIAFB_NUM_GPIOS];
}; };
/* /*
......
drivers/video/via/viafbdev.c
View file @ c5f34757
...@@ -49,11 +49,6 @@ char *viafb_active_dev; ...@@ -49,11 +49,6 @@ char *viafb_active_dev;
char *viafb_lcd_port = ""; char *viafb_lcd_port = "";
char *viafb_dvi_port = ""; char *viafb_dvi_port = "";
static void viafb_set_device(struct device_t active_dev);
static int apply_device_setting(struct viafb_ioctl_setting setting_info,
struct fb_info *info);
static void apply_second_mode_setting(struct fb_var_screeninfo
*sec_var);
static void retrieve_device_setting(struct viafb_ioctl_setting static void retrieve_device_setting(struct viafb_ioctl_setting
*setting_info); *setting_info);
static int viafb_pan_display(struct fb_var_screeninfo *var, static int viafb_pan_display(struct fb_var_screeninfo *var,
...@@ -221,9 +216,9 @@ static int viafb_check_var(struct fb_var_screeninfo *var, ...@@ -221,9 +216,9 @@ static int viafb_check_var(struct fb_var_screeninfo *var,
/* Adjust var according to our driver's own table */ /* Adjust var according to our driver's own table */
viafb_fill_var_timing_info(var, viafb_refresh, vmode_entry); viafb_fill_var_timing_info(var, viafb_refresh, vmode_entry);
if (info->var.accel_flags & FB_ACCELF_TEXT && if (var->accel_flags & FB_ACCELF_TEXT &&
!ppar->shared->vdev->engine_mmio) !ppar->shared->vdev->engine_mmio)
info->var.accel_flags = 0; var->accel_flags = 0;
return 0; return 0;
} }
...@@ -234,6 +229,7 @@ static int viafb_set_par(struct fb_info *info) ...@@ -234,6 +229,7 @@ static int viafb_set_par(struct fb_info *info)
struct VideoModeTable *vmode_entry, *vmode_entry1 = NULL; struct VideoModeTable *vmode_entry, *vmode_entry1 = NULL;
DEBUG_MSG(KERN_INFO "viafb_set_par!\n"); DEBUG_MSG(KERN_INFO "viafb_set_par!\n");
viafb_update_fix(info);
viapar->depth = fb_get_color_depth(&info->var, &info->fix); viapar->depth = fb_get_color_depth(&info->var, &info->fix);
viafb_update_device_setting(viafbinfo->var.xres, viafbinfo->var.yres, viafb_update_device_setting(viafbinfo->var.xres, viafbinfo->var.yres,
viafbinfo->var.bits_per_pixel, viafb_refresh, 0); viafbinfo->var.bits_per_pixel, viafb_refresh, 0);
...@@ -257,7 +253,6 @@ static int viafb_set_par(struct fb_info *info) ...@@ -257,7 +253,6 @@ static int viafb_set_par(struct fb_info *info)
} }
if (vmode_entry) { if (vmode_entry) {
viafb_update_fix(info);
if (viafb_dual_fb && viapar->iga_path == IGA2) if (viafb_dual_fb && viapar->iga_path == IGA2)
viafb_bpp1 = info->var.bits_per_pixel; viafb_bpp1 = info->var.bits_per_pixel;
else else
...@@ -478,13 +473,6 @@ static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg) ...@@ -478,13 +473,6 @@ static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
if (gpu32 & LCD_Device) if (gpu32 & LCD_Device)
viafb_lcd_disable(); viafb_lcd_disable();
break; break;
case VIAFB_SET_DEVICE:
if (copy_from_user(&u.active_dev, (void *)argp,
sizeof(u.active_dev)))
return -EFAULT;
viafb_set_device(u.active_dev);
viafb_set_par(info);
break;
case VIAFB_GET_DEVICE: case VIAFB_GET_DEVICE:
u.active_dev.crt = viafb_CRT_ON; u.active_dev.crt = viafb_CRT_ON;
u.active_dev.dvi = viafb_DVI_ON; u.active_dev.dvi = viafb_DVI_ON;
...@@ -527,21 +515,6 @@ static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg) ...@@ -527,21 +515,6 @@ static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
break; break;
case VIAFB_SET_DEVICE_INFO:
if (copy_from_user(&u.viafb_setting,
argp, sizeof(u.viafb_setting)))
return -EFAULT;
if (apply_device_setting(u.viafb_setting, info) < 0)
return -EINVAL;
break;
case VIAFB_SET_SECOND_MODE:
if (copy_from_user(&u.sec_var, argp, sizeof(u.sec_var)))
return -EFAULT;
apply_second_mode_setting(&u.sec_var);
break;
case VIAFB_GET_DEVICE_INFO: case VIAFB_GET_DEVICE_INFO:
retrieve_device_setting(&u.viafb_setting); retrieve_device_setting(&u.viafb_setting);
...@@ -913,112 +886,6 @@ static int viafb_sync(struct fb_info *info) ...@@ -913,112 +886,6 @@ static int viafb_sync(struct fb_info *info)
return 0; return 0;
} }
static void check_available_device_to_enable(int device_id)
{
int device_num = 0;
/* Initialize: */
viafb_CRT_ON = STATE_OFF;
viafb_DVI_ON = STATE_OFF;
viafb_LCD_ON = STATE_OFF;
viafb_LCD2_ON = STATE_OFF;
viafb_DeviceStatus = None_Device;
if ((device_id & CRT_Device) && (device_num < MAX_ACTIVE_DEV_NUM)) {
viafb_CRT_ON = STATE_ON;
device_num++;
viafb_DeviceStatus |= CRT_Device;
}
if ((device_id & DVI_Device) && (device_num < MAX_ACTIVE_DEV_NUM)) {
viafb_DVI_ON = STATE_ON;
device_num++;
viafb_DeviceStatus |= DVI_Device;
}
if ((device_id & LCD_Device) && (device_num < MAX_ACTIVE_DEV_NUM)) {
viafb_LCD_ON = STATE_ON;
device_num++;
viafb_DeviceStatus |= LCD_Device;
}
if ((device_id & LCD2_Device) && (device_num < MAX_ACTIVE_DEV_NUM)) {
viafb_LCD2_ON = STATE_ON;
device_num++;
viafb_DeviceStatus |= LCD2_Device;
}
if (viafb_DeviceStatus == None_Device) {
/* Use CRT as default active device: */
viafb_CRT_ON = STATE_ON;
viafb_DeviceStatus = CRT_Device;
}
DEBUG_MSG(KERN_INFO "Device Status:%x", viafb_DeviceStatus);
}
static void viafb_set_device(struct device_t active_dev)
{
/* Check available device to enable: */
int device_id = None_Device;
if (active_dev.crt)
device_id |= CRT_Device;
if (active_dev.dvi)
device_id |= DVI_Device;
if (active_dev.lcd)
device_id |= LCD_Device;
check_available_device_to_enable(device_id);
/* Check property of LCD: */
if (viafb_LCD_ON) {
if (active_dev.lcd_dsp_cent) {
viaparinfo->lvds_setting_info->display_method =
viafb_lcd_dsp_method = LCD_CENTERING;
} else {
viaparinfo->lvds_setting_info->display_method =
viafb_lcd_dsp_method = LCD_EXPANDSION;
}
if (active_dev.lcd_mode == LCD_SPWG) {
viaparinfo->lvds_setting_info->lcd_mode =
viafb_lcd_mode = LCD_SPWG;
} else {
viaparinfo->lvds_setting_info->lcd_mode =
viafb_lcd_mode = LCD_OPENLDI;
}
if (active_dev.lcd_panel_id <= LCD_PANEL_ID_MAXIMUM) {
viafb_lcd_panel_id = active_dev.lcd_panel_id;
viafb_init_lcd_size();
}
}
/* Check property of mode: */
if (!active_dev.xres1)
viafb_second_xres = 640;
else
viafb_second_xres = active_dev.xres1;
if (!active_dev.yres1)
viafb_second_yres = 480;
else
viafb_second_yres = active_dev.yres1;
if (active_dev.bpp != 0)
viafb_bpp = active_dev.bpp;
if (active_dev.bpp1 != 0)
viafb_bpp1 = active_dev.bpp1;
if (active_dev.refresh != 0)
viafb_refresh = active_dev.refresh;
if (active_dev.refresh1 != 0)
viafb_refresh1 = active_dev.refresh1;
if ((active_dev.samm == STATE_OFF) || (active_dev.samm == STATE_ON))
viafb_SAMM_ON = active_dev.samm;
viafb_primary_dev = active_dev.primary_dev;
via_set_primary_address(0);
via_set_secondary_address(viafb_SAMM_ON ? viafb_second_offset : 0);
viafb_set_iga_path();
}
static int get_primary_device(void) static int get_primary_device(void)
{ {
int primary_device = 0; int primary_device = 0;
...@@ -1060,124 +927,6 @@ static int get_primary_device(void) ...@@ -1060,124 +927,6 @@ static int get_primary_device(void)
return primary_device; return primary_device;
} }
static void apply_second_mode_setting(struct fb_var_screeninfo
*sec_var)
{
u32 htotal, vtotal, long_refresh;
htotal = sec_var->xres + sec_var->left_margin +
sec_var->right_margin + sec_var->hsync_len;
vtotal = sec_var->yres + sec_var->upper_margin +
sec_var->lower_margin + sec_var->vsync_len;
if ((sec_var->xres_virtual * (sec_var->bits_per_pixel >> 3)) & 0x1F) {
/*Is 32 bytes alignment? */
/*32 pixel alignment */
sec_var->xres_virtual = (sec_var->xres_virtual + 31) & ~31;
}
htotal = sec_var->xres + sec_var->left_margin +
sec_var->right_margin + sec_var->hsync_len;
vtotal = sec_var->yres + sec_var->upper_margin +
sec_var->lower_margin + sec_var->vsync_len;
long_refresh = 1000000000UL / sec_var->pixclock * 1000;
long_refresh /= (htotal * vtotal);
viafb_second_xres = sec_var->xres;
viafb_second_yres = sec_var->yres;
viafb_second_virtual_xres = sec_var->xres_virtual;
viafb_second_virtual_yres = sec_var->yres_virtual;
viafb_bpp1 = sec_var->bits_per_pixel;
viafb_refresh1 = viafb_get_refresh(sec_var->xres, sec_var->yres,
long_refresh);
}
static int apply_device_setting(struct viafb_ioctl_setting setting_info,
struct fb_info *info)
{
int need_set_mode = 0;
DEBUG_MSG(KERN_INFO "apply_device_setting\n");
if (setting_info.device_flag) {
need_set_mode = 1;
check_available_device_to_enable(setting_info.device_status);
}
/* Unlock LCD's operation according to LCD flag
and check if the setting value is valid. */
/* If the value is valid, apply the new setting value to the device. */
if (viafb_LCD_ON) {
if (setting_info.lcd_operation_flag & OP_LCD_CENTERING) {
need_set_mode = 1;
if (setting_info.lcd_attributes.display_center) {
/* Centering */
viaparinfo->lvds_setting_info->display_method =
LCD_CENTERING;
viafb_lcd_dsp_method = LCD_CENTERING;
viaparinfo->lvds_setting_info2->display_method =
viafb_lcd_dsp_method = LCD_CENTERING;
} else {
/* expandsion */
viaparinfo->lvds_setting_info->display_method =
LCD_EXPANDSION;
viafb_lcd_dsp_method = LCD_EXPANDSION;
viaparinfo->lvds_setting_info2->display_method =
LCD_EXPANDSION;
viafb_lcd_dsp_method = LCD_EXPANDSION;
}
}
if (setting_info.lcd_operation_flag & OP_LCD_MODE) {
need_set_mode = 1;
if (setting_info.lcd_attributes.lcd_mode ==
LCD_SPWG) {
viaparinfo->lvds_setting_info->lcd_mode =
viafb_lcd_mode = LCD_SPWG;
} else {
viaparinfo->lvds_setting_info->lcd_mode =
viafb_lcd_mode = LCD_OPENLDI;
}
viaparinfo->lvds_setting_info2->lcd_mode =
viaparinfo->lvds_setting_info->lcd_mode;
}
if (setting_info.lcd_operation_flag & OP_LCD_PANEL_ID) {
need_set_mode = 1;
if (setting_info.lcd_attributes.panel_id <=
LCD_PANEL_ID_MAXIMUM) {
viafb_lcd_panel_id =
setting_info.lcd_attributes.panel_id;
viafb_init_lcd_size();
}
}
}
if (0 != (setting_info.samm_status & OP_SAMM)) {
setting_info.samm_status =
setting_info.samm_status & (~OP_SAMM);
if (setting_info.samm_status == 0
|| setting_info.samm_status == 1) {
viafb_SAMM_ON = setting_info.samm_status;
if (viafb_SAMM_ON)
viafb_primary_dev = setting_info.primary_device;
via_set_primary_address(0);
via_set_secondary_address(viafb_SAMM_ON ?
viafb_second_offset : 0);
viafb_set_iga_path();
}
need_set_mode = 1;
}
if (!need_set_mode) {
;
} else {
viafb_set_iga_path();
viafb_set_par(info);
}
return true;
}
static void retrieve_device_setting(struct viafb_ioctl_setting static void retrieve_device_setting(struct viafb_ioctl_setting
*setting_info) *setting_info)
{ {
...@@ -1776,10 +1525,6 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev) ...@@ -1776,10 +1525,6 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev)
parse_lcd_port(); parse_lcd_port();
parse_dvi_port(); parse_dvi_port();
/* for dual-fb must viafb_SAMM_ON=1 and viafb_dual_fb=1 */
if (!viafb_SAMM_ON)
viafb_dual_fb = 0;
viafb_init_chip_info(vdev->chip_type); viafb_init_chip_info(vdev->chip_type);
/* /*
* The framebuffer will have been successfully mapped by * The framebuffer will have been successfully mapped by
...@@ -1823,30 +1568,13 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev) ...@@ -1823,30 +1568,13 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev)
parse_mode(viafb_mode1, &viafb_second_xres, parse_mode(viafb_mode1, &viafb_second_xres,
&viafb_second_yres); &viafb_second_yres);
if (0 == viafb_second_virtual_xres) { viafb_second_virtual_xres = viafb_second_xres;
switch (viafb_second_xres) { viafb_second_virtual_yres = viafb_second_yres;
case 1400:
viafb_second_virtual_xres = 1408;
break;
default:
viafb_second_virtual_xres = viafb_second_xres;
break;
}
}
if (0 == viafb_second_virtual_yres)
viafb_second_virtual_yres = viafb_second_yres;
} }
default_var.xres = default_xres; default_var.xres = default_xres;
default_var.yres = default_yres; default_var.yres = default_yres;
switch (default_xres) { default_var.xres_virtual = default_xres;
case 1400:
default_var.xres_virtual = 1408;
break;
default:
default_var.xres_virtual = default_xres;
break;
}
default_var.yres_virtual = default_yres; default_var.yres_virtual = default_yres;
default_var.bits_per_pixel = viafb_bpp; default_var.bits_per_pixel = viafb_bpp;
default_var.pixclock = default_var.pixclock =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7