Commit 7b5570df authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.20-2026-02-19' of... 

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

 into drm-next

amd-drm-next-6.20-2026-02-19:

amdgpu:
- Fixes for DC analog support
- DC FAMS fixes
- DML 2.1 fixes
- eDP fixes
- Misc DC fixes
- Fastboot fix
- 3DLUT fixes
- GPUVM fixes
- 64bpp format fix
- XGMI fix
- Fix for MacBooks with switchable gfx

amdkfd:
- Fix piority inversion with MQDs
- NULL check fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20260219172807.2451298-1-alexander.deucher@amd.com
parents 3e213851 3ce2ad26

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

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static const char *amdkfd_fence_get_timeline_name(struct dma_fence *f) 
{

	struct amdgpu_amdkfd_fence *fence = to_amdgpu_amdkfd_fence(f);



	return fence->timeline_name;

	return fence ? fence->timeline_name : NULL;

}



/**

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

+4 −3
Original line number Diff line number Diff line
@@ -4615,9 +4615,10 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	/* APUs w/ gfx9 onwards doesn't reply on PCIe atomics, rather it is a

	 * internal path natively support atomics, set have_atomics_support to true.

	 */

	} else if ((adev->flags & AMD_IS_APU) &&

		   (amdgpu_ip_version(adev, GC_HWIP, 0) >

		    IP_VERSION(9, 0, 0))) {

	} else if ((adev->flags & AMD_IS_APU &&

		   amdgpu_ip_version(adev, GC_HWIP, 0) > IP_VERSION(9, 0, 0)) ||

		   (adev->gmc.xgmi.connected_to_cpu &&

		   amdgpu_ip_version(adev, GC_HWIP, 0) >= IP_VERSION(12, 1, 0))) {

		adev->have_atomics_support = true;

	} else {

		adev->have_atomics_support =

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

+10 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,16 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev) 
	case CHIP_RENOIR:

		adev->mman.keep_stolen_vga_memory = true;

		break;

	case CHIP_POLARIS10:

	case CHIP_POLARIS11:

	case CHIP_POLARIS12:

		/* MacBookPros with switchable graphics put VRAM at 0 when

		 * the iGPU is enabled which results in cursor issues if

		 * the cursor ends up at 0.  Reserve vram at 0 in that case.

		 */

		if (adev->gmc.vram_start == 0)

			adev->mman.keep_stolen_vga_memory = true;

		break;

	default:

		adev->mman.keep_stolen_vga_memory = false;

		break;

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

+4 −4
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ 
#include "amdgpu_ras.h"



/* VA hole for 48bit and 57bit addresses */

#define AMDGPU_GMC_HOLE_START	(adev->vm_manager.root_level == AMDGPU_VM_PDB3 ?\

#define AMDGPU_GMC_HOLE_START	(adev->vm_manager.max_level == 4 ?\

				0x0100000000000000ULL : 0x0000800000000000ULL)

#define AMDGPU_GMC_HOLE_END	(adev->vm_manager.root_level == AMDGPU_VM_PDB3 ?\

#define AMDGPU_GMC_HOLE_END	(adev->vm_manager.max_level == 4 ?\

				0xff00000000000000ULL : 0xffff800000000000ULL)



/*
@@ -45,8 +45,8 @@ 
 * This mask is used to remove the upper 16bits of the VA and so come up with

 * the linear addr value.

 */

#define AMDGPU_GMC_HOLE_MASK	(adev->vm_manager.root_level == AMDGPU_VM_PDB3 ?\

				0x00ffffffffffffffULL : 0x0000ffffffffffffULL)

#define AMDGPU_GMC_HOLE_MASK	(adev->vm_manager.max_level == 4 ?\

				0x01ffffffffffffffULL : 0x0000ffffffffffffULL)



/*

 * Ring size as power of two for the log of recent faults.

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

+1 −0
Original line number Diff line number Diff line
@@ -2400,6 +2400,7 @@ void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size, 
	}



	adev->vm_manager.max_pfn = (uint64_t)vm_size << 18;

	adev->vm_manager.max_level = max_level;



	tmp = roundup_pow_of_two(adev->vm_manager.max_pfn);

	if (amdgpu_vm_block_size != -1)