Commit 4a56c0ed authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.10-2024-04-26' of... 

Merge tag 'amd-drm-next-6.10-2024-04-26' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-6.10-2024-04-26:

amdgpu:
- Misc code cleanups and refactors
- Support setting reset method at runtime
- Report OD status
- SMU 14.0.1 fixes
- SDMA 4.4.2 fixes
- VPE fixes
- MES fixes
- Update BO eviction priorities
- UMSCH fixes
- Reset fixes
- Freesync fixes
- GFXIP 9.4.3 fixes
- SDMA 5.2 fixes
- MES UAF fix
- RAS updates
- Devcoredump updates for dumping IP state
- DSC fixes
- JPEG fix
- Fix VRAM memory accounting
- VCN 5.0 fixes
- MES fixes
- UMC 12.0 updates
- Modify contiguous flags handling
- Initial support for mapping kernel queues via MES

amdkfd:
- Fix rescheduling of restore worker
- VRAM accounting for SVM migrations
- mGPU fix
- Enable SQ watchpoint for gfx10

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240426221245.1613332-1-alexander.deucher@amd.com
parents 68b89e23 b77bef36

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

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int aldebaran_mode2_suspend_ip(struct amdgpu_device *adev) 
		adev->ip_blocks[i].status.hw = false;

	}



	return r;

	return 0;

}



static int

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

+9 −0
Original line number Diff line number Diff line
@@ -139,6 +139,14 @@ enum amdgpu_ss { 
	AMDGPU_SS_DRV_UNLOAD

};



struct amdgpu_hwip_reg_entry {

	u32		hwip;

	u32		inst;

	u32		seg;

	u32		reg_offset;

	const char	*reg_name;

};



struct amdgpu_watchdog_timer {

	bool timeout_fatal_disable;

	uint32_t period; /* maxCycles = (1 << period), the number of cycles before a timeout */
@@ -494,6 +502,7 @@ struct amdgpu_wb { 
	uint64_t		gpu_addr;

	u32			num_wb;	/* Number of wb slots actually reserved for amdgpu. */

	unsigned long		used[DIV_ROUND_UP(AMDGPU_MAX_WB, BITS_PER_LONG)];

	spinlock_t		lock;

};



int amdgpu_device_wb_get(struct amdgpu_device *adev, u32 *wb);

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

+2 −0
Original line number Diff line number Diff line
@@ -637,6 +637,8 @@ static const struct amd_ip_funcs acp_ip_funcs = { 
	.soft_reset = acp_soft_reset,

	.set_clockgating_state = acp_set_clockgating_state,

	.set_powergating_state = acp_set_powergating_state,

	.dump_ip_state = NULL,

	.print_ip_state = NULL,

};



const struct amdgpu_ip_block_version acp_ip_block = {

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

+8 −1
Original line number Diff line number Diff line
@@ -747,10 +747,17 @@ bool amdgpu_amdkfd_is_fed(struct amdgpu_device *adev) 
	return amdgpu_ras_get_fed_status(adev);

}



void amdgpu_amdkfd_ras_pasid_poison_consumption_handler(struct amdgpu_device *adev,

				enum amdgpu_ras_block block, uint16_t pasid,

				pasid_notify pasid_fn, void *data, uint32_t reset)

{

	amdgpu_umc_pasid_poison_handler(adev, block, pasid, pasid_fn, data, reset);

}



void amdgpu_amdkfd_ras_poison_consumption_handler(struct amdgpu_device *adev,

	enum amdgpu_ras_block block, uint32_t reset)

{

	amdgpu_umc_poison_handler(adev, block, reset);

	amdgpu_umc_pasid_poison_handler(adev, block, 0, NULL, NULL, reset);

}



int amdgpu_amdkfd_send_close_event_drain_irq(struct amdgpu_device *adev,

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

+5 −0
Original line number Diff line number Diff line
@@ -337,6 +337,11 @@ 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, uint32_t reset);



void amdgpu_amdkfd_ras_pasid_poison_consumption_handler(struct amdgpu_device *adev,

			enum amdgpu_ras_block block, uint16_t pasid,

			pasid_notify pasid_fn, void *data, uint32_t 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);