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

drm/radeon: improve soft reset on CIK 



Disable CG/PG before resetting.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a6f4ae8d

drivers/gpu/drm/radeon/cik.c

+6 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev); 
static void cik_program_aspm(struct radeon_device *rdev);

static void cik_init_pg(struct radeon_device *rdev);

static void cik_init_cg(struct radeon_device *rdev);

static void cik_fini_pg(struct radeon_device *rdev);

static void cik_fini_cg(struct radeon_device *rdev);

static void cik_enable_gui_idle_interrupt(struct radeon_device *rdev,

					  bool enable);
@@ -4185,6 +4187,10 @@ static void cik_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 CG/PG */

	cik_fini_pg(rdev);

	cik_fini_cg(rdev);



	/* stop the rlc */

	cik_rlc_stop(rdev);