History

drm/radeon/kms: fix up gpio i2c mask bits for r4xx for real

Fixes i2c test failures when i2c_algo_bit.bit_test=1. The hw doesn't actually require a mask, so just set it to the default mask bits for r1xx-r4xx radeon ddc. I missed this part the first time through.

Alex Deucher committed 14 years ago

Commit d7245021 parent 26cc40a1 file · +12 −0Browse files

Unified · Split

drivers/gpu/drm/radeon/radeon_atombios.c+12−0
@@ -181,6 +181,18 @@ void radeon_atombios_i2c_init(struct radeon_device *rdev) · 180 unmodified lines
181 gpio = &i2c_info->asGPIO_Info[i];181 gpio = &i2c_info->asGPIO_Info[i];
182 i2c.valid = false;182 i2c.valid = false;
183 183
184 /* r4xx mask is technically not used by the hw, so patch in the legacy mask bits */
185 if ((rdev->family == CHIP_R420) ||
186 (rdev->family == CHIP_R423) ||
187 (rdev->family == CHIP_RV410)) {
188 if ((le16_to_cpu(gpio->usClkMaskRegisterIndex) == 0x0018) ||
189 (le16_to_cpu(gpio->usClkMaskRegisterIndex) == 0x0019) ||
190 (le16_to_cpu(gpio->usClkMaskRegisterIndex) == 0x001a)) {
191 gpio->ucClkMaskShift = 0x19;
192 gpio->ucDataMaskShift = 0x18;
193 }
194 }
195
184 /* some evergreen boards have bad data for this entry */196 /* some evergreen boards have bad data for this entry */
185 if (ASIC_IS_DCE4(rdev)) {197 if (ASIC_IS_DCE4(rdev)) {
186 if ((i == 7) &&198 if ((i == 7) &&