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

Merge tag 'amd-drm-fixes-7.1-2026-05-06' of... 

Merge tag 'amd-drm-fixes-7.1-2026-05-06' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-7.1-2026-05-06:

amdgpu:
- GFX9 fixes
- Hawaii SMU fixes
- SDMA4 fix
- GART fix
- Userq fixes

amdkfd:
- GPUVM TLB flush fix
- Hotplug fix

radeon:
- Hawaii SMU fixes

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20260506154631.1733034-1-alexander.deucher@amd.com
parents 765e717d 4e02e0af

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

+3 −10
Original line number Diff line number Diff line
@@ -3149,11 +3149,7 @@ static int __init amdgpu_init(void) 


	r = amdgpu_sync_init();

	if (r)

		goto error_sync;



	r = amdgpu_userq_fence_slab_init();

	if (r)

		goto error_fence;

		return r;



	amdgpu_register_atpx_handler();

	amdgpu_acpi_detect();
@@ -3161,7 +3157,7 @@ static int __init amdgpu_init(void) 
	/* Ignore KFD init failures when CONFIG_HSA_AMD is not set. */

	r = amdgpu_amdkfd_init();

	if (r && r != -ENOENT)

		goto error_fence;

		goto error_fini_sync;



	if (amdgpu_pp_feature_mask & PP_OVERDRIVE_MASK) {

		add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_STILL_OK);
@@ -3172,10 +3168,8 @@ static int __init amdgpu_init(void) 
	/* let modprobe override vga console setting */

	return pci_register_driver(&amdgpu_kms_pci_driver);



error_fence:

error_fini_sync:

	amdgpu_sync_fini();



error_sync:

	return r;

}
@@ -3186,7 +3180,6 @@ static void __exit amdgpu_exit(void) 
	amdgpu_unregister_atpx_handler();

	amdgpu_acpi_release();

	amdgpu_sync_fini();

	amdgpu_userq_fence_slab_fini();

	mmu_notifier_synchronize();

	amdgpu_xcp_drv_release();

}

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

+10 −3
Original line number Diff line number Diff line
@@ -262,12 +262,19 @@ void amdgpu_gart_table_ram_free(struct amdgpu_device *adev) 
 */

int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev)

{

	int r;



	if (adev->gart.bo != NULL)

		return 0;



	return amdgpu_bo_create_kernel(adev,  adev->gart.table_size, PAGE_SIZE,

	r = amdgpu_bo_create_kernel(adev,  adev->gart.table_size, PAGE_SIZE,

				    AMDGPU_GEM_DOMAIN_VRAM, &adev->gart.bo,

				    NULL, (void *)&adev->gart.ptr);

	if (r)

		return r;



	memset_io(adev->gart.ptr, adev->gart.gart_pte_flags, adev->gart.table_size);

	return 0;

}



/**

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

+4 −24
Original line number Diff line number Diff line
@@ -32,29 +32,9 @@ 
#include "amdgpu.h"

#include "amdgpu_userq_fence.h"



static const struct dma_fence_ops amdgpu_userq_fence_ops;

static struct kmem_cache *amdgpu_userq_fence_slab;



#define AMDGPU_USERQ_MAX_HANDLES	(1U << 16)



int amdgpu_userq_fence_slab_init(void)

{

	amdgpu_userq_fence_slab = kmem_cache_create("amdgpu_userq_fence",

						    sizeof(struct amdgpu_userq_fence),

						    0,

						    SLAB_HWCACHE_ALIGN,

						    NULL);

	if (!amdgpu_userq_fence_slab)

		return -ENOMEM;



	return 0;

}



void amdgpu_userq_fence_slab_fini(void)

{

	rcu_barrier();

	kmem_cache_destroy(amdgpu_userq_fence_slab);

}

static const struct dma_fence_ops amdgpu_userq_fence_ops;



static inline struct amdgpu_userq_fence *to_amdgpu_userq_fence(struct dma_fence *f)

{
@@ -231,7 +211,7 @@ void amdgpu_userq_fence_driver_put(struct amdgpu_userq_fence_driver *fence_drv) 


static int amdgpu_userq_fence_alloc(struct amdgpu_userq_fence **userq_fence)

{

	*userq_fence = kmem_cache_alloc(amdgpu_userq_fence_slab, GFP_ATOMIC);

	*userq_fence = kmalloc(sizeof(**userq_fence), GFP_KERNEL);

	return *userq_fence ? 0 : -ENOMEM;

}
@@ -342,7 +322,7 @@ static void amdgpu_userq_fence_free(struct rcu_head *rcu) 
	amdgpu_userq_fence_driver_put(fence_drv);



	kvfree(userq_fence->fence_drv_array);

	kmem_cache_free(amdgpu_userq_fence_slab, userq_fence);

	kfree(userq_fence);

}



static void amdgpu_userq_fence_release(struct dma_fence *f)
@@ -545,7 +525,7 @@ int amdgpu_userq_signal_ioctl(struct drm_device *dev, void *data, 
	r = amdgpu_userq_fence_create(queue, userq_fence, wptr, &fence);

	if (r) {

		mutex_unlock(&userq_mgr->userq_mutex);

		kmem_cache_free(amdgpu_userq_fence_slab, userq_fence);

		kfree(userq_fence);

		goto put_gobj_write;

	}

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

+0 −3
Original line number Diff line number Diff line
@@ -58,9 +58,6 @@ struct amdgpu_userq_fence_driver { 
	char timeline_name[TASK_COMM_LEN];

};



int amdgpu_userq_fence_slab_init(void);

void amdgpu_userq_fence_slab_fini(void);



void amdgpu_userq_fence_driver_get(struct amdgpu_userq_fence_driver *fence_drv);

void amdgpu_userq_fence_driver_put(struct amdgpu_userq_fence_driver *fence_drv);

int amdgpu_userq_fence_driver_alloc(struct amdgpu_device *adev,

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

+0 −3
Original line number Diff line number Diff line
@@ -5660,9 +5660,6 @@ static void gfx_v9_0_ring_emit_fence_kiq(struct amdgpu_ring *ring, u64 addr, 
{

	struct amdgpu_device *adev = ring->adev;



	/* we only allocate 32bit for each seq wb address */

	BUG_ON(flags & AMDGPU_FENCE_FLAG_64BIT);



	/* write fence seq to the "addr" */

	amdgpu_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));

	amdgpu_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |