radeon: tmds bracket failure found by krh.
authorDave Airlie <airlied@linux.ie>
Thu, 18 Sep 2008 22:03:34 +0000 (08:03 +1000)
committerDave Airlie <airlied@linux.ie>
Thu, 18 Sep 2008 22:03:34 +0000 (08:03 +1000)
linux-core/radeon_atombios.c

index 4d48593..0915a7f 100644 (file)
@@ -374,9 +374,9 @@ void radeon_atombios_get_tmds_info(struct radeon_encoder *encoder)
                for (i = 0; i < 4; i++) {
                        encoder->tmds_pll[i].freq = le16_to_cpu(tmds_info->asMiscInfo[i].usFrequency);
                        encoder->tmds_pll[i].value = tmds_info->asMiscInfo[i].ucPLL_ChargePump & 0x3f;
                for (i = 0; i < 4; i++) {
                        encoder->tmds_pll[i].freq = le16_to_cpu(tmds_info->asMiscInfo[i].usFrequency);
                        encoder->tmds_pll[i].value = tmds_info->asMiscInfo[i].ucPLL_ChargePump & 0x3f;
-                       encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VCO_Gain & 0x3f << 6);
-                       encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_DutyCycle & 0xf << 12);
-                       encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VoltageSwing & 0xf << 16);
+                       encoder->tmds_pll[i].value |= ((tmds_info->asMiscInfo[i].ucPLL_VCO_Gain & 0x3f) << 6);
+                       encoder->tmds_pll[i].value |= ((tmds_info->asMiscInfo[i].ucPLL_DutyCycle & 0xf) << 12);
+                       encoder->tmds_pll[i].value |= ((tmds_info->asMiscInfo[i].ucPLL_VoltageSwing & 0xf) << 16);
 
                        DRM_DEBUG("TMDS PLL From BIOS %u %x\n",
                                  encoder->tmds_pll[i].freq,
 
                        DRM_DEBUG("TMDS PLL From BIOS %u %x\n",
                                  encoder->tmds_pll[i].freq,