diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2011-07-23 18:02:04 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-04 21:58:36 -0700 |
| commit | eec8f481cc0114fd86b2b3d5258b4933cd731571 (patch) | |
| tree | 76c8bc94b1b771d67ad66dd61aee4d2747e81433 /drivers/gpu | |
| parent | fbb04a1c17686592b5e74e45e210f20c40b68d08 (diff) | |
| download | kernel_samsung_tuna-eec8f481cc0114fd86b2b3d5258b4933cd731571.zip kernel_samsung_tuna-eec8f481cc0114fd86b2b3d5258b4933cd731571.tar.gz kernel_samsung_tuna-eec8f481cc0114fd86b2b3d5258b4933cd731571.tar.bz2 | |
drm/radeon/kms: fix i2c map for rv250/280
commit 6dd666333ddee39903d86f870d5c40d9f100e0cc upstream.
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>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_combios.c | 3 |
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 e459467..a74217c 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"); |