Commit 4e8303cf authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Use function for IP version check 



Use an inline function for version check. Gives more flexibility to
handle any format changes.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent addd7aef

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

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static bool aldebaran_is_mode2_default(struct amdgpu_reset_control *reset_ctl) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)reset_ctl->handle;



	if ((adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 2) &&

	if ((amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 2) &&

	     adev->gmc.xgmi.connected_to_cpu))

		return true;
@@ -154,7 +154,7 @@ aldebaran_mode2_perform_reset(struct amdgpu_reset_control *reset_ctl, 
	if (reset_device_list == NULL)

		return -EINVAL;



	if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 2) &&

	if (amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 2) &&

	    reset_context->hive == NULL) {

		/* Wrong context, return error */

		return -EINVAL;
@@ -335,7 +335,7 @@ aldebaran_mode2_restore_hwcontext(struct amdgpu_reset_control *reset_ctl, 
	if (reset_device_list == NULL)

		return -EINVAL;



	if (reset_context->reset_req_dev->ip_versions[MP1_HWIP][0] ==

	if (amdgpu_ip_version(reset_context->reset_req_dev, MP1_HWIP, 0) ==

		    IP_VERSION(13, 0, 2) &&

	    reset_context->hive == NULL) {

		/* Wrong context, return error */

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

+6 −0
Original line number Diff line number Diff line
@@ -1105,6 +1105,12 @@ struct amdgpu_device { 
	bool                            debug_disable_soft_recovery;

};



static inline uint32_t amdgpu_ip_version(const struct amdgpu_device *adev,

					 uint8_t ip, uint8_t inst)

{

	return adev->ip_versions[ip][inst];

}



static inline struct amdgpu_device *drm_to_adev(struct drm_device *ddev)

{

	return container_of(ddev, struct amdgpu_device, ddev);

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

+1 −1
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ void amdgpu_amdkfd_set_compute_idle(struct amdgpu_device *adev, bool idle) 
	/* Temporary workaround to fix issues observed in some

	 * compute applications when GFXOFF is enabled on GFX11.

	 */

	if (IP_VERSION_MAJ(adev->ip_versions[GC_HWIP][0]) == 11) {

	if (IP_VERSION_MAJ(amdgpu_ip_version(adev, GC_HWIP, 0)) == 11) {

		pr_debug("GFXOFF is %s\n", idle ? "enabled" : "disabled");

		amdgpu_gfx_off_ctrl(adev, idle);

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ static int kgd_gfx_v11_validate_trap_override_request(struct amdgpu_device *adev 
				KFD_DBG_TRAP_MASK_DBG_ADDRESS_WATCH |

				KFD_DBG_TRAP_MASK_DBG_MEMORY_VIOLATION;



	if (adev->ip_versions[GC_HWIP][0] >= IP_VERSION(11, 0, 4))

	if (amdgpu_ip_version(adev, GC_HWIP, 0) >= IP_VERSION(11, 0, 4))

		*trap_mask_supported |= KFD_DBG_TRAP_MASK_TRAP_ON_WAVE_START |

					KFD_DBG_TRAP_MASK_TRAP_ON_WAVE_END;

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

+1 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ void kgd_gfx_v9_set_wave_launch_stall(struct amdgpu_device *adev, 
	int i;

	uint32_t data = RREG32(SOC15_REG_OFFSET(GC, 0, mmSPI_GDBG_WAVE_CNTL));



	if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(9, 4, 1))

	if (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(9, 4, 1))

		data = REG_SET_FIELD(data, SPI_GDBG_WAVE_CNTL, STALL_VMID,

							stall ? 1 << vmid : 0);

	else