]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
drm/radeon: add quirk to make HP nx6125 laptop resume.
authorDave Airlie <airlied@redhat.com>
Wed, 30 Jun 2010 03:26:11 +0000 (13:26 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 1 Jul 2010 01:59:41 +0000 (11:59 +1000)
For some reason on resume, executing the BIOS scripts locks up the whole chipset, by avoiding the dynclk table the machine resumes properly and seems to function okay.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_combios.c

index 08e156a7e4d43357398dbde9fa6d1a538069ce15..392bc4d68a4d5d698d3cfe5bb883a65da1e00922 100644 (file)
@@ -3051,6 +3051,14 @@ void radeon_combios_asic_init(struct drm_device *dev)
                combios_write_ram_size(dev);
        }
 
+       /* quirk for rs4xx HP nx6125 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 == 0x308b)
+               return;
+
        /* DYN CLK 1 */
        table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);
        if (table)