aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-07-24 11:42:20 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-07-25 21:43:48 -0400
commitc04c5b1da18ec73eaabc7b8a8757545865426fc2 (patch)
tree74b6e83bb5a39155b94a65e3753266a63368457e
parent946fd35f88ae7ef910229e7995ab0c32d52517b4 (diff)
drm/nouveau: Fix TV-out detection on unposted cards lacking a usable DCB table.
Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nv04_display.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_display.c b/drivers/gpu/drm/nouveau/nv04_display.c
index cd70bd827614..9e28cf772e3c 100644
--- a/drivers/gpu/drm/nouveau/nv04_display.c
+++ b/drivers/gpu/drm/nouveau/nv04_display.c
@@ -78,6 +78,14 @@ nv04_display_store_initial_head_owner(struct drm_device *dev)
78int 78int
79nv04_display_early_init(struct drm_device *dev) 79nv04_display_early_init(struct drm_device *dev)
80{ 80{
81 /* Make the I2C buses accessible. */
82 if (!nv_gf4_disp_arch(dev)) {
83 uint32_t pmc_enable = nv_rd32(dev, NV03_PMC_ENABLE);
84
85 if (!(pmc_enable & 1))
86 nv_wr32(dev, NV03_PMC_ENABLE, pmc_enable | 1);
87 }
88
81 /* Unlock the VGA CRTCs. */ 89 /* Unlock the VGA CRTCs. */
82 NVLockVgaCrtcs(dev, false); 90 NVLockVgaCrtcs(dev, false);
83 91