Commit d80391dd authored by Asad Kamal's avatar Asad Kamal Committed by Alex Deucher
Browse files

drm/amdgpu: Remove invalidate and flush hdp macros 



Remove amdgpu_asic_flush_hdp & amdgpu_asic_invalidate_hdp functions and
directly use the mapped ones

Signed-off-by: default avatarAsad Kamal <asad.kamal@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 527e3d40

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

+0 −2
Original line number Diff line number Diff line
@@ -1539,8 +1539,6 @@ int emu_soc_asic_init(struct amdgpu_device *adev); 
#define amdgpu_asic_read_bios_from_rom(adev, b, l) (adev)->asic_funcs->read_bios_from_rom((adev), (b), (l))

#define amdgpu_asic_read_register(adev, se, sh, offset, v)((adev)->asic_funcs->read_register((adev), (se), (sh), (offset), (v)))

#define amdgpu_asic_get_config_memsize(adev) (adev)->asic_funcs->get_config_memsize((adev))

#define amdgpu_asic_flush_hdp(adev, r) amdgpu_hdp_flush(adev, r)

#define amdgpu_asic_invalidate_hdp(adev, r) amdgpu_hdp_invalidate(adev, r)

#define amdgpu_asic_need_full_reset(adev) (adev)->asic_funcs->need_full_reset((adev))

#define amdgpu_asic_init_doorbell_index(adev) (adev)->asic_funcs->init_doorbell_index((adev))

#define amdgpu_asic_get_pcie_usage(adev, cnt0, cnt1) ((adev)->asic_funcs->get_pcie_usage((adev), (cnt0), (cnt1)))

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

+2 −2
Original line number Diff line number Diff line
@@ -7327,7 +7327,7 @@ void amdgpu_device_flush_hdp(struct amdgpu_device *adev, 
			return;

	}



	amdgpu_asic_flush_hdp(adev, ring);

	amdgpu_hdp_flush(adev, ring);

}



void amdgpu_device_invalidate_hdp(struct amdgpu_device *adev,
@@ -7340,7 +7340,7 @@ void amdgpu_device_invalidate_hdp(struct amdgpu_device *adev, 
	if (adev->gmc.xgmi.connected_to_cpu)

		return;



	amdgpu_asic_invalidate_hdp(adev, ring);

	amdgpu_hdp_invalidate(adev, ring);

}



int amdgpu_in_reset(struct amdgpu_device *adev)

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

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static void sdma_v5_2_ring_emit_hdp_flush(struct amdgpu_ring *ring) 
	const struct nbio_hdp_flush_reg *nbio_hf_reg = adev->nbio.hdp_flush_reg;



	if (ring->me > 1) {

		amdgpu_asic_flush_hdp(adev, ring);

		amdgpu_hdp_flush(adev, ring);

	} else {

		ref_and_mask = nbio_hf_reg->ref_and_mask_sdma0 << ring->me;

drivers/gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static int smu10_copy_table_from_smc(struct pp_hwmgr *hwmgr, 
			priv->smu_tables.entry[table_id].table_id,

			NULL);



	amdgpu_asic_invalidate_hdp(adev, NULL);

	amdgpu_hdp_invalidate(adev, NULL);



	memcpy(table, (uint8_t *)priv->smu_tables.entry[table_id].table,

			priv->smu_tables.entry[table_id].size);
@@ -164,7 +164,7 @@ static int smu10_copy_table_to_smc(struct pp_hwmgr *hwmgr, 
	memcpy(priv->smu_tables.entry[table_id].table, table,

			priv->smu_tables.entry[table_id].size);



	amdgpu_asic_flush_hdp(adev, NULL);

	amdgpu_hdp_flush(adev, NULL);



	smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_SetDriverDramAddrHigh,

drivers/gpu/drm/amd/pm/powerplay/smumgr/vega10_smumgr.c

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int vega10_copy_table_from_smc(struct pp_hwmgr *hwmgr, 
			priv->smu_tables.entry[table_id].table_id,

			NULL);



	amdgpu_asic_invalidate_hdp(adev, NULL);

	amdgpu_hdp_invalidate(adev, NULL);



	memcpy(table, priv->smu_tables.entry[table_id].table,

			priv->smu_tables.entry[table_id].size);
@@ -90,7 +90,7 @@ static int vega10_copy_table_to_smc(struct pp_hwmgr *hwmgr, 
	memcpy(priv->smu_tables.entry[table_id].table, table,

			priv->smu_tables.entry[table_id].size);



	amdgpu_asic_flush_hdp(adev, NULL);

	amdgpu_hdp_flush(adev, NULL);



	smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_SetDriverDramAddrHigh,