summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_combios.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2011-07-23 18:02:04 +0000
committerDave Airlie <airlied@redhat.com>2011-07-25 11:51:45 +0100
commit6dd666333ddee39903d86f870d5c40d9f100e0cc (patch)
tree6058d61a089d96f4bdbebd43b28985e7d0239865 /drivers/gpu/drm/radeon/radeon_combios.c
parent603f2e6d378948bf5e5ac04d98673761362a3b79 (diff)
downloadblackbird-obmc-linux-6dd666333ddee39903d86f870d5c40d9f100e0cc.tar.gz
blackbird-obmc-linux-6dd666333ddee39903d86f870d5c40d9f100e0cc.zip
drm/radeon/kms: fix i2c map for rv250/280
Those chips have crt2_ddc bus. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=39672 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_combios.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_combios.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index e4594676a07c..a74217cd192f 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -779,7 +779,8 @@ void radeon_combios_i2c_init(struct radeon_device *rdev)
}
}
}
- } else if (rdev->family >= CHIP_R200) {
+ } else if ((rdev->family == CHIP_R200) ||
+ (rdev->family >= CHIP_R300)) {
/* 0x68 */
i2c = combios_setup_i2c_bus(rdev, DDC_MONID, 0, 0);
rdev->i2c_bus[3] = radeon_i2c_create(dev, &i2c, "MONID");
OpenPOWER on IntegriCloud