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

Commit f4585824 authored by Xiaojie Yuan's avatar Xiaojie Yuan Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu/gfx10: re-init clear state buffer after gpu reset 



commit 210b3b3c7563df391bd81d49c51af303b928de4a upstream.

This patch fixes 2nd baco reset failure with gfxoff enabled on navi1x.

clear state buffer (resides in vram) is corrupted after 1st baco reset,
upon gfxoff exit, CPF gets garbage header in CSIB and hangs.

Signed-off-by: default avatarXiaojie Yuan <xiaojie.yuan@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eebab684

drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

+37 −6
Original line number Diff line number Diff line
@@ -1785,27 +1785,52 @@ static void gfx_v10_0_enable_gui_idle_interrupt(struct amdgpu_device *adev, 
	WREG32_SOC15(GC, 0, mmCP_INT_CNTL_RING0, tmp);

}



static void gfx_v10_0_init_csb(struct amdgpu_device *adev)

static int gfx_v10_0_init_csb(struct amdgpu_device *adev)

{

	int r;



	if (adev->in_gpu_reset) {

		r = amdgpu_bo_reserve(adev->gfx.rlc.clear_state_obj, false);

		if (r)

			return r;



		r = amdgpu_bo_kmap(adev->gfx.rlc.clear_state_obj,

				   (void **)&adev->gfx.rlc.cs_ptr);

		if (!r) {

			adev->gfx.rlc.funcs->get_csb_buffer(adev,

					adev->gfx.rlc.cs_ptr);

			amdgpu_bo_kunmap(adev->gfx.rlc.clear_state_obj);

		}



		amdgpu_bo_unreserve(adev->gfx.rlc.clear_state_obj);

		if (r)

			return r;

	}



	/* csib */

	WREG32_SOC15(GC, 0, mmRLC_CSIB_ADDR_HI,

		     adev->gfx.rlc.clear_state_gpu_addr >> 32);

	WREG32_SOC15(GC, 0, mmRLC_CSIB_ADDR_LO,

		     adev->gfx.rlc.clear_state_gpu_addr & 0xfffffffc);

	WREG32_SOC15(GC, 0, mmRLC_CSIB_LENGTH, adev->gfx.rlc.clear_state_size);



	return 0;

}



static void gfx_v10_0_init_pg(struct amdgpu_device *adev)

static int gfx_v10_0_init_pg(struct amdgpu_device *adev)

{

	int i;

	int r;



	gfx_v10_0_init_csb(adev);

	r = gfx_v10_0_init_csb(adev);

	if (r)

		return r;



	for (i = 0; i < adev->num_vmhubs; i++)

		amdgpu_gmc_flush_gpu_tlb(adev, 0, i, 0);



	/* TODO: init power gating */

	return;

	return 0;

}



void gfx_v10_0_rlc_stop(struct amdgpu_device *adev)
@@ -1907,7 +1932,10 @@ static int gfx_v10_0_rlc_resume(struct amdgpu_device *adev) 
		r = gfx_v10_0_wait_for_rlc_autoload_complete(adev);

		if (r)

			return r;

		gfx_v10_0_init_pg(adev);



		r = gfx_v10_0_init_pg(adev);

		if (r)

			return r;



		/* enable RLC SRM */

		gfx_v10_0_rlc_enable_srm(adev);
@@ -1933,7 +1961,10 @@ static int gfx_v10_0_rlc_resume(struct amdgpu_device *adev) 
				return r;

		}



		gfx_v10_0_init_pg(adev);

		r = gfx_v10_0_init_pg(adev);

		if (r)

			return r;



		adev->gfx.rlc.funcs->start(adev);



		if (adev->firmware.load_type == AMDGPU_FW_LOAD_RLC_BACKDOOR_AUTO) {