Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / drivers / gpu / drm / radeon / radeon_combios.c

diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index e0138b674aca038e99b020000cdfec0285aef405..8bf83c4b4147541b0379f75dcec3e36177848dd1 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -620,8 +620,8 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde
                i2c.y_data_mask = 0x80;
        } else {
                /* default masks for ddc pads */
-               i2c.mask_clk_mask = RADEON_GPIO_EN_1;
-               i2c.mask_data_mask = RADEON_GPIO_EN_0;
+               i2c.mask_clk_mask = RADEON_GPIO_MASK_1;
+               i2c.mask_data_mask = RADEON_GPIO_MASK_0;
                i2c.a_clk_mask = RADEON_GPIO_A_1;
                i2c.a_data_mask = RADEON_GPIO_A_0;
                i2c.en_clk_mask = RADEON_GPIO_EN_1;
@@ -3298,6 +3298,14 @@ void radeon_combios_asic_init(struct drm_device *dev)
            rdev->pdev->subsystem_device == 0x30a4)
                return;
 
+       /* quirk for rs4xx Compaq Presario V5245EU laptop to make it resume
+        * - it hangs on resume inside the dynclk 1 table.
+        */
+       if (rdev->family == CHIP_RS480 &&
+           rdev->pdev->subsystem_vendor == 0x103c &&
+           rdev->pdev->subsystem_device == 0x30ae)
+               return;
+
        /* DYN CLK 1 */
        table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);
        if (table)