Commit 591aec15 authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Save VCN shared memory with init reset 



VCN shared memory is in framebuffer and there are some flags initialized
during sw_init. Ideally, such programming should be during hw_init.

Make sure the flags are saved during reset on initialization since that
reset will affect frame buffer region. For clarity, separate it out to
another function.

Fixes: 1e4acf4d ("drm/amdgpu: Add reset on init handler for XGMI")
Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reported-by: default avatarHao Zhou <hao.zhou@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 971d8e1c

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

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ static int amdgpu_reset_xgmi_reset_on_init_suspend(struct amdgpu_device *adev) 
		adev->ip_blocks[i].status.hw = false;

	}



	/* VCN FW shared region is in frambuffer, there are some flags

	 * initialized in that region during sw_init. Make sure the region is

	 * backed up.

	 */

	amdgpu_vcn_save_vcpu_bo(adev);



	return 0;

}

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

+16 −10
Original line number Diff line number Diff line
@@ -294,21 +294,12 @@ bool amdgpu_vcn_is_disabled_vcn(struct amdgpu_device *adev, enum vcn_ring_type t 
	return ret;

}



int amdgpu_vcn_suspend(struct amdgpu_device *adev)

int amdgpu_vcn_save_vcpu_bo(struct amdgpu_device *adev)

{

	unsigned int size;

	void *ptr;

	int i, idx;



	bool in_ras_intr = amdgpu_ras_intr_triggered();



	cancel_delayed_work_sync(&adev->vcn.idle_work);



	/* err_event_athub will corrupt VCPU buffer, so we need to

	 * restore fw data and clear buffer in amdgpu_vcn_resume() */

	if (in_ras_intr)

		return 0;



	for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {

		if (adev->vcn.harvest_config & (1 << i))

			continue;
@@ -327,7 +318,22 @@ int amdgpu_vcn_suspend(struct amdgpu_device *adev) 
			drm_dev_exit(idx);

		}

	}



	return 0;

}



int amdgpu_vcn_suspend(struct amdgpu_device *adev)

{

	bool in_ras_intr = amdgpu_ras_intr_triggered();



	cancel_delayed_work_sync(&adev->vcn.idle_work);



	/* err_event_athub will corrupt VCPU buffer, so we need to

	 * restore fw data and clear buffer in amdgpu_vcn_resume() */

	if (in_ras_intr)

		return 0;



	return amdgpu_vcn_save_vcpu_bo(adev);

}



int amdgpu_vcn_resume(struct amdgpu_device *adev)

drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h

+1 −0
Original line number Diff line number Diff line
@@ -518,5 +518,6 @@ int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev); 


int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx,

			       enum AMDGPU_UCODE_ID ucode_id);

int amdgpu_vcn_save_vcpu_bo(struct amdgpu_device *adev);



#endif