diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index e8cc951..3a5eb77 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -456,19 +456,14 @@ static void RADEONApplyLegacyQuirks(ScrnInfoPtr pScrn, int index)
     } else if ((info->ChipFamily == CHIP_FAMILY_RS400 ||
 		info->ChipFamily == CHIP_FAMILY_RS480) &&
 	       info->BiosConnector[index].ddc_i2c.mask_clk_reg == RADEON_GPIO_MONID) {
-	info->BiosConnector[index].ddc_i2c.valid = TRUE;
-	info->BiosConnector[index].ddc_i2c.mask_clk_mask = (0x20 << 8);
-	info->BiosConnector[index].ddc_i2c.mask_data_mask = 0x80;
-	info->BiosConnector[index].ddc_i2c.put_clk_mask = (0x20 << 8);
-	info->BiosConnector[index].ddc_i2c.put_data_mask = 0x80;
-	info->BiosConnector[index].ddc_i2c.get_clk_mask = (0x20 << 8);
-	info->BiosConnector[index].ddc_i2c.get_data_mask = 0x80;
-	info->BiosConnector[index].ddc_i2c.mask_clk_reg = RADEON_GPIOPAD_MASK;
-	info->BiosConnector[index].ddc_i2c.mask_data_reg = RADEON_GPIOPAD_MASK;
-	info->BiosConnector[index].ddc_i2c.put_clk_reg = RADEON_GPIOPAD_EN;
-	info->BiosConnector[index].ddc_i2c.put_data_reg = RADEON_GPIOPAD_EN;
-	info->BiosConnector[index].ddc_i2c.get_clk_reg = RADEON_LCD_GPIO_Y_REG;
-	info->BiosConnector[index].ddc_i2c.get_data_reg = RADEON_LCD_GPIO_Y_REG;
+	info->BiosConnector[index].ddc_i2c = legacy_setup_i2c_bus(RADEON_LCD_GPIO_MASK);
+	//info->BiosConnector[index].ddc_i2c = legacy_setup_i2c_bus(RADEON_MDGPIO_EN_REG);
+	info->BiosConnector[index].ddc_i2c.mask_clk_mask = 0x2000;
+	info->BiosConnector[index].ddc_i2c.mask_data_mask = 0x1000;
+	info->BiosConnector[index].ddc_i2c.put_clk_mask = 0x2000;
+	info->BiosConnector[index].ddc_i2c.put_data_mask = 0x1000;
+	info->BiosConnector[index].ddc_i2c.get_clk_mask = 0x2000;
+	info->BiosConnector[index].ddc_i2c.get_data_mask = 0x1000;
     }
 
     /* Certain IBM chipset RN50s have a BIOS reporting two VGAs,