diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-03-02 20:48:19 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-05-24 15:55:58 +1000 |
| commit | 3cbfae361bf5e779d3364f0f31cfd25bd0f59e65 (patch) | |
| tree | a91f620590fbcbbb6d4a585c309b74d53d7d4aae /src/cayman_accel.c | |
| parent | b8ade97c9d0fa5aacb0e3166868bb72e9bc679a6 (diff) | |
cayman: add spi state to default state
changed in e3145801b80fd4be4cf770128876e86e89bda66f
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Diffstat (limited to 'src/cayman_accel.c')
| -rw-r--r-- | src/cayman_accel.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/cayman_accel.c b/src/cayman_accel.c index 8dd901ae..3d803c2e 100644 --- a/src/cayman_accel.c +++ b/src/cayman_accel.c @@ -163,7 +163,7 @@ cayman_set_default_state(ScrnInfoPtr pScrn) E32(0); // PA_SC_MODE_CNTL_0 E32(0); // PA_SC_MODE_CNTL_1 - PACK0(PA_SC_CENTROID_PRIORITY_0, 27); + PACK0(PA_SC_CENTROID_PRIORITY_0, 34); E32((0 << DISTANCE_0_shift) | (1 << DISTANCE_1_shift) | (2 << DISTANCE_2_shift) | @@ -227,6 +227,17 @@ cayman_set_default_state(ScrnInfoPtr pScrn) E32(0); E32(0); + /* src = semantic id 0; mask = semantic id 1 */ + EREG(SPI_VS_OUT_ID_0, ((0 << SEMANTIC_0_shift) | + (1 << SEMANTIC_1_shift))); + PACK0(SPI_PS_INPUT_CNTL_0 + (0 << 2), 2); + /* SPI_PS_INPUT_CNTL_0 maps to GPR[0] - load with semantic id 0 */ + E32(((0 << SEMANTIC_shift) | + (0x01 << DEFAULT_VAL_shift))); + /* SPI_PS_INPUT_CNTL_1 maps to GPR[1] - load with semantic id 1 */ + E32(((1 << SEMANTIC_shift) | + (0x01 << DEFAULT_VAL_shift))); + PACK0(SPI_INPUT_Z, 13); E32(0); // SPI_INPUT_Z E32(0); // SPI_FOG_CNTL |