diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-10-20 15:09:09 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-10-20 15:09:09 -0200 |
| commit | 71990e0beece6e60ffbffccfdf56e5a71641a120 (patch) | |
| tree | 35053a0c5a1d1210cdccc85fb43dc1360e96d772 /src | |
| parent | 8b7ce66e26113ec5859566e7f3d0fd15d3e29eaa (diff) | |
Don't change M1XCLK unless option specified in xorg.conf.
Also add more complete description of programmable clocks.
Diffstat (limited to 'src')
| -rw-r--r-- | src/smi_501.c | 10 | ||||
| -rw-r--r-- | src/smi_501.h | 19 |
2 files changed, 14 insertions, 15 deletions
diff --git a/src/smi_501.c b/src/smi_501.c index 1816423..26669cf 100644 --- a/src/smi_501.c +++ b/src/smi_501.c @@ -178,10 +178,6 @@ SMI501_HWInit(ScrnInfoPtr pScrn) mode->clock.f.m_divider = 1; mode->clock.f.m_shift = 0; - /* FIXME probably should not "touch" m1clk. A value other then 112Mhz - * will instant lock on my test prototype, "or" maybe it just means - * that m1clk value must be equal to mclk value? (and mclk must be - * set first!?) */ switch (pSmi->MCLK) { case 168000: /* 336/1/1 */ mode->clock.f.m1_select = 1; @@ -199,11 +195,15 @@ SMI501_HWInit(ScrnInfoPtr pScrn) mode->clock.f.m1_shift = 1; break; case 112000: /* 336/3/0 */ - default: mode->clock.f.m1_select = 1; mode->clock.f.m1_divider = 1; mode->clock.f.m1_shift = 0; break; + default: + /* Do nothing. Use what was configured by the kernel. + * Accordingly to SMI, this should be 144Mhz for 6ns sdram, + * or 112Mhz for other types of sdram. */ + break; } diff --git a/src/smi_501.h b/src/smi_501.h index 77eaa13..e42606a 100644 --- a/src/smi_501.h +++ b/src/smi_501.h @@ -123,32 +123,31 @@ authorization from the XFree86 Project and Silicon Motion. * 31:31 Disable 2X P2XCLK. * 0: Normal. * 1: 1X clock for P2CLK. - * - * Remarks: - * Table 2-2: Programmable Clock Branches - * Clock Description - * P2XCLK 2X clock source for the Panel interface timing. - * The actual rate at which the pixels are shifted - * out is P2XCLK divided by two. - * V2XCLK 2X clock source for the CRT interface timing. - * The actual rate at which the pixels are shifted - * out is V2XCLK divided by two */ typedef union _MSOCClockRec { struct { + /* Clock source for the local SDRAM controller. */ int32_t m1_shift : bits( 0, 2); int32_t m1_divider : bits( 3, 3); int32_t m1_select : bits( 4, 4); int32_t u0 : bits( 5, 7); + /* Main clock source for all functional blocks, + * such as the 2D engine, GPIO, Video Engine, DMA Engine. */ int32_t m_shift : bits( 8, 10); int32_t m_divider : bits(11, 11); int32_t m_select : bits(12, 12); int32_t u1 : bits(13, 15); + /* 2X clock source for the CRT interface timing. + * The actual rate at which the pixels are shifted + * out is V2XCLK divided by two. */ int32_t v2_shift : bits(16, 18); int32_t v2_divider : bits(19, 19); int32_t v2_select : bits(20, 20); int32_t v2_1xclck : bits(21, 21); int32_t u2 : bits(22, 23); + /* 2X clock source for the Panel interface timing. + * The actual rate at which the pixels are shifted + * out is P2XCLK divided by two. */ int32_t p2_shift : bits(24, 26); int32_t p2_divider : bits(27, 28); int32_t p2_select : bits(29, 29); |