summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@freedesktop.org>2009-10-28 10:07:52 +0100
committerEgbert Eich <eich@freedesktop.org>2009-10-28 10:07:52 +0100
commitcee33c18a5f66c805c9df9f960a073ac0c62947a (patch)
tree05990d2c3d6ff924c494f5559af30665900e79f8
parent8b89b94d50f08b672cacb6f053dc8dd7ea754183 (diff)
DIG: Improve code readability by using names for bits.
-rw-r--r--src/rhd_dig.c5
-rw-r--r--src/rhd_regs.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/src/rhd_dig.c b/src/rhd_dig.c
index 782c8db..3458d4b 100644
--- a/src/rhd_dig.c
+++ b/src/rhd_dig.c
@@ -1098,7 +1098,8 @@ EncoderSet(struct rhdOutput *Output, struct rhdCrtc *Crtc, DisplayModePtr Mode)
rhdPrintDigDebug(rhdPtr,__func__);
- RHDRegMask(Output, off + RV620_DIG1_CNTL, Output->Crtc->Id,
+ RHDRegMask(Output, off + RV620_DIG1_CNTL,
+ (Output->Crtc->Id ? RV62_DIG_SOURCE_SELECT_FMT2 : RV62_DIG_SOURCE_SELECT_FMT1),
RV62_DIG_SOURCE_SELECT);
if (Output->Id == RHD_OUTPUT_UNIPHYA) {
@@ -1146,7 +1147,7 @@ EncoderSet(struct rhdOutput *Output, struct rhdCrtc *Crtc, DisplayModePtr Mode)
(Private->EncoderMode & 0x7) << 8
| RV62_DIG_START
| (Private->RunDualLink ? RV62_DIG_DUAL_LINK_ENABLE : 0)
- | Output->Crtc->Id,
+ | (Output->Crtc->Id ? RV62_DIG_SOURCE_SELECT_FMT2 : RV62_DIG_SOURCE_SELECT_FMT1),
RV62_DIG_MODE
| RV62_DIG_START
| RV62_DIG_DUAL_LINK_ENABLE
diff --git a/src/rhd_regs.h b/src/rhd_regs.h
index 0e75d06..04c3f50 100644
--- a/src/rhd_regs.h
+++ b/src/rhd_regs.h
@@ -620,7 +620,9 @@ enum RV620_DIG_CNTL_BITS {
RV62_DIG_START = (0x1 << 6),
RV62_DIG_MODE = (0x7 << 8),
RV62_DIG_STEREOSYNC_SELECT = (1 << 2),
- RV62_DIG_SOURCE_SELECT = (1 << 0)
+ RV62_DIG_SOURCE_SELECT = (1 << 0),
+ RV62_DIG_SOURCE_SELECT_FMT1 = (0 << 0),
+ RV62_DIG_SOURCE_SELECT_FMT2 = (1 << 0)
};
enum RV620_DIG_LVDS_DATA_CNTL_BITS {