Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/radeon: fix display handling in radeon_gpu_reset

If the display hw was reset or a hard reset was used,
we need to re-init some of the common display hardware as well.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

+16
+16
drivers/gpu/drm/radeon/radeon_device.c
··· 1681 1681 /* block TTM */ 1682 1682 resched = ttm_bo_lock_delayed_workqueue(&rdev->mman.bdev); 1683 1683 radeon_suspend(rdev); 1684 + radeon_hpd_fini(rdev); 1684 1685 1685 1686 for (i = 0; i < RADEON_NUM_RINGS; ++i) { 1686 1687 ring_sizes[i] = radeon_ring_backup(rdev, &rdev->ring[i], ··· 1737 1736 /* resume old pm late */ 1738 1737 radeon_pm_resume(rdev); 1739 1738 } 1739 + 1740 + /* init dig PHYs, disp eng pll */ 1741 + if (rdev->is_atom_bios) { 1742 + radeon_atom_encoder_init(rdev); 1743 + radeon_atom_disp_eng_pll_init(rdev); 1744 + /* turn on the BL */ 1745 + if (rdev->mode_info.bl_encoder) { 1746 + u8 bl_level = radeon_get_backlight_level(rdev, 1747 + rdev->mode_info.bl_encoder); 1748 + radeon_set_backlight_level(rdev, rdev->mode_info.bl_encoder, 1749 + bl_level); 1750 + } 1751 + } 1752 + /* reset hpd state */ 1753 + radeon_hpd_init(rdev); 1740 1754 1741 1755 drm_helper_resume_force_mode(rdev->ddev); 1742 1756