diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2017-06-19 15:59:58 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-29 12:48:52 +0200 |
| commit | 4f3d0f468552b83eaa011e17af358bf418d23da2 (patch) | |
| tree | b1d5a8d286b78ac4fc8c2b04fa55e6dda18cd980 /drivers | |
| parent | f8242fa8119b935d4b94557139fca1ba7ad8dd66 (diff) | |
| download | linux-stable-4f3d0f468552b83eaa011e17af358bf418d23da2.tar.gz linux-stable-4f3d0f468552b83eaa011e17af358bf418d23da2.tar.bz2 linux-stable-4f3d0f468552b83eaa011e17af358bf418d23da2.zip | |
drm/radeon: add a quirk for Toshiba Satellite L20-183
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_combios.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index a9b01bcf7d0a..fcecaf5b5526 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -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); |