Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6f4ae8d authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: improve soft reset on SI 



Disable CG/PG and stop the rlc before resetting.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 5fd9c581

drivers/gpu/drm/radeon/si.c

+10 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ extern void si_dma_vm_set_page(struct radeon_device *rdev, 
			       uint32_t incr, uint32_t flags);

static void si_enable_gui_idle_interrupt(struct radeon_device *rdev,

					 bool enable);

static void si_fini_pg(struct radeon_device *rdev);

static void si_fini_cg(struct radeon_device *rdev);

static void si_rlc_stop(struct radeon_device *rdev);



static const u32 verde_rlc_save_restore_register_list[] =

{
@@ -3608,6 +3611,13 @@ static void si_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) 
	dev_info(rdev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",

		 RREG32(VM_CONTEXT1_PROTECTION_FAULT_STATUS));



	/* disable PG/CG */

	si_fini_pg(rdev);

	si_fini_cg(rdev);



	/* stop the rlc */

	si_rlc_stop(rdev);



	/* Disable CP parsing/prefetching */

	WREG32(CP_ME_CNTL, CP_ME_HALT | CP_PFP_HALT | CP_CE_HALT);