diff options
author | Eric Anholt <eric@anholt.net> | 2009-12-01 14:56:30 -0500 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-12-01 14:56:30 -0500 |
commit | f0217c42c9ab3d772e543f635ce628b9478f70b6 (patch) | |
tree | 01dfcd607f90f250fb27cb303747b3d770879742 /drivers/gpu/drm/i915/i915_reg.h | |
parent | d09c23de9f967a7b7dcee0ffc57222ddbd821aba (diff) |
drm/i915: Fix DDC on some systems by clearing BIOS GMBUS setup.
This is a sync of a fix I made in the old UMS code. If the BIOS uses
the GMBUS and doesn't clear that setup, then our bit-banging I2C can
fail, leading to monitors not being detected.
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 6b596020d362..c4a273513b2f 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -414,6 +414,13 @@ | |||
414 | # define GPIO_DATA_VAL_IN (1 << 12) | 414 | # define GPIO_DATA_VAL_IN (1 << 12) |
415 | # define GPIO_DATA_PULLUP_DISABLE (1 << 13) | 415 | # define GPIO_DATA_PULLUP_DISABLE (1 << 13) |
416 | 416 | ||
417 | #define GMBUS0 0x5100 | ||
418 | #define GMBUS1 0x5104 | ||
419 | #define GMBUS2 0x5108 | ||
420 | #define GMBUS3 0x510c | ||
421 | #define GMBUS4 0x5110 | ||
422 | #define GMBUS5 0x5120 | ||
423 | |||
417 | /* | 424 | /* |
418 | * Clock control & power management | 425 | * Clock control & power management |
419 | */ | 426 | */ |
@@ -2166,6 +2173,13 @@ | |||
2166 | #define PCH_GPIOE 0xc5020 | 2173 | #define PCH_GPIOE 0xc5020 |
2167 | #define PCH_GPIOF 0xc5024 | 2174 | #define PCH_GPIOF 0xc5024 |
2168 | 2175 | ||
2176 | #define PCH_GMBUS0 0xc5100 | ||
2177 | #define PCH_GMBUS1 0xc5104 | ||
2178 | #define PCH_GMBUS2 0xc5108 | ||
2179 | #define PCH_GMBUS3 0xc510c | ||
2180 | #define PCH_GMBUS4 0xc5110 | ||
2181 | #define PCH_GMBUS5 0xc5120 | ||
2182 | |||
2169 | #define PCH_DPLL_A 0xc6014 | 2183 | #define PCH_DPLL_A 0xc6014 |
2170 | #define PCH_DPLL_B 0xc6018 | 2184 | #define PCH_DPLL_B 0xc6018 |
2171 | 2185 | ||