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

viafb: add engine clock support

This patch adds support for enabling and configuring the engine on
VIAs IGPs. This is the main clock used for everything but pixel
output.

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

+55
+1
drivers/video/via/hw.c
··· 2289 2289 get_sync(viafbinfo1)); 2290 2290 } 2291 2291 2292 + clock.set_engine_pll_state(VIA_STATE_ON); 2292 2293 clock.set_primary_clock_source(VIA_CLKSRC_X1, true); 2293 2294 clock.set_secondary_clock_source(VIA_CLKSRC_X1, true); 2294 2295
+51
drivers/video/via/via_clock.c
··· 87 87 via_write_reg_mask(VIASR, 0x40, 0x00, 0x04); /* disable reset */ 88 88 } 89 89 90 + static inline void set_engine_pll_encoded(u32 data) 91 + { 92 + via_write_reg_mask(VIASR, 0x40, 0x01, 0x01); /* enable reset */ 93 + via_write_reg(VIASR, 0x47, data & 0xFF); 94 + via_write_reg(VIASR, 0x48, (data >> 8) & 0xFF); 95 + via_write_reg(VIASR, 0x49, (data >> 16) & 0xFF); 96 + via_write_reg_mask(VIASR, 0x40, 0x00, 0x01); /* disable reset */ 97 + } 98 + 90 99 static void cle266_set_primary_pll(struct via_pll_config config) 91 100 { 92 101 cle266_set_primary_pll_encoded(cle266_encode_pll(config)); ··· 124 115 static void vx855_set_secondary_pll(struct via_pll_config config) 125 116 { 126 117 k800_set_secondary_pll_encoded(vx855_encode_pll(config)); 118 + } 119 + 120 + static void k800_set_engine_pll(struct via_pll_config config) 121 + { 122 + set_engine_pll_encoded(k800_encode_pll(config)); 123 + } 124 + 125 + static void vx855_set_engine_pll(struct via_pll_config config) 126 + { 127 + set_engine_pll_encoded(vx855_encode_pll(config)); 127 128 } 128 129 129 130 static void set_primary_pll_state(u8 state) ··· 170 151 } 171 152 172 153 via_write_reg_mask(VIASR, 0x2D, value, 0x0C); 154 + } 155 + 156 + static void set_engine_pll_state(u8 state) 157 + { 158 + u8 value; 159 + 160 + switch (state) { 161 + case VIA_STATE_ON: 162 + value = 0x02; 163 + break; 164 + case VIA_STATE_OFF: 165 + value = 0x00; 166 + break; 167 + default: 168 + return; 169 + } 170 + 171 + via_write_reg_mask(VIASR, 0x2D, value, 0x03); 173 172 } 174 173 175 174 static void set_primary_clock_state(u8 state) ··· 284 247 printk(KERN_INFO "Using undocumented set PLL state.\n%s", via_slap); 285 248 } 286 249 250 + static void dummy_set_pll(struct via_pll_config config) 251 + { 252 + printk(KERN_INFO "Using undocumented set PLL.\n%s", via_slap); 253 + } 254 + 287 255 void via_clock_init(struct via_clock *clock, int gfx_chip) 288 256 { 289 257 switch (gfx_chip) { ··· 303 261 clock->set_secondary_clock_source = dummy_set_clock_source; 304 262 clock->set_secondary_pll_state = dummy_set_pll_state; 305 263 clock->set_secondary_pll = cle266_set_secondary_pll; 264 + 265 + clock->set_engine_pll_state = dummy_set_pll_state; 266 + clock->set_engine_pll = dummy_set_pll; 306 267 break; 307 268 case UNICHROME_K800: 308 269 case UNICHROME_PM800: ··· 325 280 clock->set_secondary_clock_source = set_secondary_clock_source; 326 281 clock->set_secondary_pll_state = set_secondary_pll_state; 327 282 clock->set_secondary_pll = k800_set_secondary_pll; 283 + 284 + clock->set_engine_pll_state = set_engine_pll_state; 285 + clock->set_engine_pll = k800_set_engine_pll; 328 286 break; 329 287 case UNICHROME_VX855: 330 288 case UNICHROME_VX900: ··· 340 292 clock->set_secondary_clock_source = set_secondary_clock_source; 341 293 clock->set_secondary_pll_state = set_secondary_pll_state; 342 294 clock->set_secondary_pll = vx855_set_secondary_pll; 295 + 296 + clock->set_engine_pll_state = set_engine_pll_state; 297 + clock->set_engine_pll = vx855_set_engine_pll; 343 298 break; 344 299 345 300 }
+3
drivers/video/via/via_clock.h
··· 53 53 void (*set_secondary_clock_source)(enum via_clksrc src, bool use_pll); 54 54 void (*set_secondary_pll_state)(u8 state); 55 55 void (*set_secondary_pll)(struct via_pll_config config); 56 + 57 + void (*set_engine_pll_state)(u8 state); 58 + void (*set_engine_pll)(struct via_pll_config config); 56 59 }; 57 60 58 61