---

yaml
---
r: 275907
b: refs/heads/master
c: d724502
h: refs/heads/master
i:
  275905: b4f6131
  275903: d5825f0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26cc40a83384178bfaefbcfb4786591498f3e190
+refs/heads/master: d724502a9d7a46f4a56a1663b1f50d2dc9d1ef40

trunk/drivers/gpu/drm/radeon/radeon_atombios.c

@@ -181,6 +181,18 @@ void radeon_atombios_i2c_init(struct radeon_device *rdev)
 			gpio = &i2c_info->asGPIO_Info[i];
 			i2c.valid = false;
 
+			/* r4xx mask is technically not used by the hw, so patch in the legacy mask bits */
+			if ((rdev->family == CHIP_R420) ||
+			    (rdev->family == CHIP_R423) ||
+			    (rdev->family == CHIP_RV410)) {
+				if ((le16_to_cpu(gpio->usClkMaskRegisterIndex) == 0x0018) ||
+				    (le16_to_cpu(gpio->usClkMaskRegisterIndex) == 0x0019) ||
+				    (le16_to_cpu(gpio->usClkMaskRegisterIndex) == 0x001a)) {
+					gpio->ucClkMaskShift = 0x19;
+					gpio->ucDataMaskShift = 0x18;
+				}
+			}
+
 			/* some evergreen boards have bad data for this entry */
 			if (ASIC_IS_DCE4(rdev)) {
 				if ((i == 7) &&