Commit af165fb0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.9-2024-03-01' of https://gitlab.freedesktop.org/agd5f/linux into drm-next 

amd-drm-next-6.9-2024-03-01:

amdgpu:
- GC 11.5.1 updates
- Misc display cleanups
- NBIO 7.9 updates
- Backlight fixes
- DMUB fixes
- MPO fixes
- atomfirmware table updates
- SR-IOV fixes
- VCN 4.x updates
- use RMW accessors for pci config registers
- PSR fixes
- Suspend/resume fixes
- RAS fixes
- ABM fixes
- Misc code cleanups
- SI DPM fix
- Revert freesync video

amdkfd:
- Misc cleanups
- Error handling fixes

radeon:
- use RMW accessors for pci config registers

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240301204857.13960-1-alexander.deucher@amd.com


Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents c6d6a82d b07395d5

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

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ extern int amdgpu_emu_mode; 
extern uint amdgpu_smu_memory_pool_size;

extern int amdgpu_smu_pptable_id;

extern uint amdgpu_dc_feature_mask;

extern uint amdgpu_freesync_vid_mode;

extern uint amdgpu_dc_debug_mask;

extern uint amdgpu_dc_visual_confirm;

extern int amdgpu_dm_abm_level;

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

+5 −0
Original line number Diff line number Diff line
@@ -742,6 +742,11 @@ void amdgpu_amdkfd_debug_mem_fence(struct amdgpu_device *adev) 
	amdgpu_device_flush_hdp(adev, NULL);

}



bool amdgpu_amdkfd_is_fed(struct amdgpu_device *adev)

{

	return amdgpu_ras_get_fed_status(adev);

}



void amdgpu_amdkfd_ras_poison_consumption_handler(struct amdgpu_device *adev,

	enum amdgpu_ras_block block, bool reset)

{

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

+2 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct kgd_mem *mem, 
					     void **kptr, uint64_t *size);

void amdgpu_amdkfd_gpuvm_unmap_gtt_bo_from_kernel(struct kgd_mem *mem);



int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_device *adev, struct amdgpu_bo *bo);

int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_bo *bo);



int amdgpu_amdkfd_gpuvm_restore_process_bos(void *process_info,

					    struct dma_fence __rcu **ef);
@@ -337,6 +337,7 @@ int amdgpu_amdkfd_get_tile_config(struct amdgpu_device *adev, 
				struct tile_config *config);

void amdgpu_amdkfd_ras_poison_consumption_handler(struct amdgpu_device *adev,

			enum amdgpu_ras_block block, bool reset);

bool amdgpu_amdkfd_is_fed(struct amdgpu_device *adev);

bool amdgpu_amdkfd_bo_mapped_to_dev(struct amdgpu_device *adev, struct kgd_mem *mem);

void amdgpu_amdkfd_block_mmu_notifications(void *p);

int amdgpu_amdkfd_criu_resume(void *p);

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

+1 −2
Original line number Diff line number Diff line
@@ -2189,13 +2189,12 @@ int amdgpu_amdkfd_gpuvm_sync_memory( 


/**

 * amdgpu_amdkfd_map_gtt_bo_to_gart - Map BO to GART and increment reference count

 * @adev: Device to which allocated BO belongs

 * @bo: Buffer object to be mapped

 *

 * Before return, bo reference count is incremented. To release the reference and unpin/

 * unmap the BO, call amdgpu_amdkfd_free_gtt_mem.

 */

int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_device *adev, struct amdgpu_bo *bo)

int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_bo *bo)

{

	int ret;

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

+11 −6
Original line number Diff line number Diff line
@@ -4040,8 +4040,10 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	 * early on during init and before calling to RREG32.

	 */

	adev->reset_domain = amdgpu_reset_create_reset_domain(SINGLE_DEVICE, "amdgpu-reset-dev");

	if (!adev->reset_domain)

		return -ENOMEM;

	if (!adev->reset_domain) {

		r = -ENOMEM;

		goto unmap_memory;

	}



	/* detect hw virtualization here */

	amdgpu_detect_virtualization(adev);
@@ -4051,20 +4053,20 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	r = amdgpu_device_get_job_timeout_settings(adev);

	if (r) {

		dev_err(adev->dev, "invalid lockup_timeout parameter syntax\n");

		return r;

		goto unmap_memory;

	}



	/* early init functions */

	r = amdgpu_device_ip_early_init(adev);

	if (r)

		return r;

		goto unmap_memory;



	amdgpu_device_set_mcbp(adev);



	/* Get rid of things like offb */

	r = drm_aperture_remove_conflicting_pci_framebuffers(adev->pdev, &amdgpu_kms_driver);

	if (r)

		return r;

		goto unmap_memory;



	/* Enable TMZ based on IP_VERSION */

	amdgpu_gmc_tmz_set(adev);
@@ -4074,7 +4076,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	if (adev->gmc.xgmi.supported) {

		r = adev->gfxhub.funcs->get_xgmi_info(adev);

		if (r)

			return r;

			goto unmap_memory;

	}



	/* enable PCIE atomic ops */
@@ -4343,6 +4345,8 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
failed:

	amdgpu_vf_error_trans_all(adev);



unmap_memory:

	iounmap(adev->rmmio);

	return r;

}
@@ -5321,6 +5325,7 @@ int amdgpu_do_asic_reset(struct list_head *device_list_handle, 
	list_for_each_entry(tmp_adev, device_list_handle, reset_list) {

		if (need_full_reset) {

			/* post card */

			amdgpu_ras_set_fed(tmp_adev, false);

			r = amdgpu_device_asic_init(tmp_adev);

			if (r) {

				dev_warn(tmp_adev->dev, "asic atom init failed!");