]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
drm/radeon: add a quirk for Toshiba Satellite L20-183
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 19 Jun 2017 19:59:58 +0000 (15:59 -0400)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 19 Jul 2017 07:58:30 +0000 (09:58 +0200)
BugLink: http://bugs.launchpad.net/bugs/1702118
commit acfd6ee4fa7ebeee75511825fe02be3f7ac1d668 upstream.

Fixes resume from suspend.

bug: https://bugzilla.kernel.org/show_bug.cgi?id=196121
Reported-by: Przemek <soprwa@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
drivers/gpu/drm/radeon/radeon_combios.c

index a9b01bcf7d0a2242cf181ef31a77cf9150e6e8f8..fcecaf5b5526766ad6243188778a96f5b20013f8 100644 (file)
@@ -3394,6 +3394,13 @@ void radeon_combios_asic_init(struct drm_device *dev)
            rdev->pdev->subsystem_vendor == 0x103c &&
            rdev->pdev->subsystem_device == 0x280a)
                return;
+       /* quirk for rs4xx Toshiba Sattellite L20-183 latop to make it resume
+        * - it hangs on resume inside the dynclk 1 table.
+        */
+       if (rdev->family == CHIP_RS400 &&
+           rdev->pdev->subsystem_vendor == 0x1179 &&
+           rdev->pdev->subsystem_device == 0xff31)
+               return;
 
        /* DYN CLK 1 */
        table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);