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

Merge tag 'amd-drm-next-6.20-2026-01-16' of... 

Merge tag 'amd-drm-next-6.20-2026-01-16' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-6.20-2026-01-16:

amdgpu:
- SR-IOV fixes
- Rework SMU mailbox handling
- Drop MMIO_REMAP domain
- UserQ fixes
- MES cleanups
- Panel Replay updates
- HDMI fixes
- Backlight fixes
- SMU 14.x fixes
- SMU 15 updates

amdkfd:
- Fix a memory leak
- Fixes for systems with non-4K pages
- LDS/Scratch cleanup
- MES process eviction fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20260116202609.23107-1-alexander.deucher@amd.com
parents 971c2b68 6a681cd9

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

+2 −0
Original line number Diff line number Diff line
@@ -269,6 +269,8 @@ extern int amdgpu_rebar; 
extern int amdgpu_wbrf;

extern int amdgpu_user_queue;



extern uint amdgpu_hdmi_hpd_debounce_delay_ms;



#define AMDGPU_VM_MAX_NUM_CTX			4096

#define AMDGPU_SG_THRESHOLD			(256*1024*1024)

#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS	        3000

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

+10 −5
Original line number Diff line number Diff line
@@ -248,6 +248,11 @@ void amdgpu_amdkfd_interrupt(struct amdgpu_device *adev, 
		kgd2kfd_interrupt(adev->kfd.dev, ih_ring_entry);

}



void amdgpu_amdkfd_teardown_processes(struct amdgpu_device *adev)

{

	kgd2kfd_teardown_processes(adev);

}



void amdgpu_amdkfd_suspend(struct amdgpu_device *adev, bool suspend_proc)

{

	if (adev->kfd.dev) {
@@ -316,8 +321,8 @@ void amdgpu_amdkfd_gpu_reset(struct amdgpu_device *adev) 
					     &adev->kfd.reset_work);

}



int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size,

				void **mem_obj, uint64_t *gpu_addr,

int amdgpu_amdkfd_alloc_kernel_mem(struct amdgpu_device *adev, size_t size,

				u32 domain, void **mem_obj, uint64_t *gpu_addr,

				void **cpu_ptr, bool cp_mqd_gfx9)

{

	struct amdgpu_bo *bo = NULL;
@@ -328,7 +333,7 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size, 
	memset(&bp, 0, sizeof(bp));

	bp.size = size;

	bp.byte_align = PAGE_SIZE;

	bp.domain = AMDGPU_GEM_DOMAIN_GTT;

	bp.domain = domain;

	bp.flags = AMDGPU_GEM_CREATE_CPU_GTT_USWC;

	bp.type = ttm_bo_type_kernel;

	bp.resv = NULL;
@@ -351,7 +356,7 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size, 
		goto allocate_mem_reserve_bo_failed;

	}



	r = amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);

	r = amdgpu_bo_pin(bo, domain);

	if (r) {

		dev_err(adev->dev, "(%d) failed to pin bo for amdkfd\n", r);

		goto allocate_mem_pin_bo_failed;
@@ -388,7 +393,7 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size, 
	return r;

}



void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void **mem_obj)

void amdgpu_amdkfd_free_kernel_mem(struct amdgpu_device *adev, void **mem_obj)

{

	struct amdgpu_bo **bo = (struct amdgpu_bo **) mem_obj;

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

+14 −3
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ struct amdkfd_process_info { 


int amdgpu_amdkfd_init(void);

void amdgpu_amdkfd_fini(void);

void amdgpu_amdkfd_teardown_processes(struct amdgpu_device *adev);



void amdgpu_amdkfd_suspend(struct amdgpu_device *adev, bool suspend_proc);

int amdgpu_amdkfd_resume(struct amdgpu_device *adev, bool resume_proc);
@@ -240,10 +241,10 @@ int amdgpu_amdkfd_bo_validate_and_fence(struct amdgpu_bo *bo, 
}

#endif

/* Shared API */

int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size,

				void **mem_obj, uint64_t *gpu_addr,

int amdgpu_amdkfd_alloc_kernel_mem(struct amdgpu_device *adev, size_t size,

				u32 domain, void **mem_obj, uint64_t *gpu_addr,

				void **cpu_ptr, bool mqd_gfx9);

void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void **mem_obj);

void amdgpu_amdkfd_free_kernel_mem(struct amdgpu_device *adev, void **mem_obj);

int amdgpu_amdkfd_alloc_gws(struct amdgpu_device *adev, size_t size,

				void **mem_obj);

void amdgpu_amdkfd_free_gws(struct amdgpu_device *adev, void *mem_obj);
@@ -438,6 +439,8 @@ int kgd2kfd_stop_sched_all_nodes(struct kfd_dev *kfd); 
bool kgd2kfd_compute_active(struct kfd_dev *kfd, uint32_t node_id);

bool kgd2kfd_vmfault_fast_path(struct amdgpu_device *adev, struct amdgpu_iv_entry *entry,

			       bool retry_fault);

void kgd2kfd_lock_kfd(void);

void kgd2kfd_teardown_processes(struct amdgpu_device *adev);



#else

static inline int kgd2kfd_init(void)
@@ -550,5 +553,13 @@ static inline bool kgd2kfd_vmfault_fast_path(struct amdgpu_device *adev, struct 
	return false;

}



static inline void kgd2kfd_lock_kfd(void)

{

}



static inline void kgd2kfd_teardown_processes(struct amdgpu_device *adev)

{

}



#endif

#endif /* AMDGPU_AMDKFD_H_INCLUDED */

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

+1 −1
Original line number Diff line number Diff line
@@ -2215,7 +2215,7 @@ int amdgpu_amdkfd_gpuvm_sync_memory( 
 * @bo_gart: Return bo reference

 *

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

 * unmap the BO, call amdgpu_amdkfd_free_gtt_mem.

 * unmap the BO, call amdgpu_amdkfd_free_kernel_mem.

 */

int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_bo *bo, struct amdgpu_bo **bo_gart)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -3509,6 +3509,7 @@ static int amdgpu_device_ip_fini_early(struct amdgpu_device *adev) 
	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);



	amdgpu_amdkfd_suspend(adev, true);

	amdgpu_amdkfd_teardown_processes(adev);

	amdgpu_userq_suspend(adev);



	/* Workaround for ASICs need to disable SMC first */