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

Merge tag 'amd-drm-next-6.18-2025-09-09' of... 

Merge tag 'amd-drm-next-6.18-2025-09-09' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-6.18-2025-09-09:

amdgpu:
- Add CRIU support for gem objects
- SI UVD fix
- SI DPM fixes
- Misc code cleanups
- RAS updates
- GPUVM debugfs fixes
- Cyan Skillfish updates
- UserQ updates
- OEM i2c fix
- SMU 13.0.x updates
- DPCD probe quirk fix
- Make vbios build number available in sysfs
- HDCP updates
- Brightness curve fixes
- eDP updates
- Vblank fixes
- DCN 3.5 PG fix
- PBN calcution fix

amdkfd:
- Add CRIU support for gem objects
- Flexible array fix
- P2P topology fix
- APU memlimit fixes
- Misc code cleanups

UAPI:
- Add CRIU support for gem objects
  Proposed userspace: https://github.com/checkpoint-restore/criu/pull/2613



radeon:
- Use dev_warn_once() in CS parsers

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://lore.kernel.org/r/20250909161928.942785-1-alexander.deucher@amd.com
parents 8d04ea1a 2fd653b9

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ amdgpu-y += \ 
	vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o arct_reg_init.o mxgpu_nv.o \

	nbio_v7_2.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o aldebaran.o soc21.o soc24.o \

	sienna_cichlid.o smu_v13_0_10.o nbio_v4_3.o hdp_v6_0.o nbio_v7_7.o hdp_v5_2.o lsdma_v6_0.o \

	nbio_v7_9.o aqua_vanjaram.o nbio_v7_11.o lsdma_v7_0.o hdp_v7_0.o nbif_v6_3_1.o

	nbio_v7_9.o aqua_vanjaram.o nbio_v7_11.o lsdma_v7_0.o hdp_v7_0.o nbif_v6_3_1.o \

	cyan_skillfish_reg_init.o



# add DF block

amdgpu-y += \

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

+5 −3
Original line number Diff line number Diff line
@@ -1149,9 +1149,6 @@ struct amdgpu_device { 
	/* for userq and VM fences */

	struct amdgpu_seq64		seq64;



	/* KFD */

	struct amdgpu_kfd_dev		kfd;



	/* UMC */

	struct amdgpu_umc		umc;
@@ -1314,6 +1311,11 @@ struct amdgpu_device { 
	struct mutex                    userq_mutex;

	bool                            userq_halt_for_enforce_isolation;

	struct amdgpu_uid *uid_info;



	/* KFD

	 * Must be last --ends in a flexible-array member.

	 */

	struct amdgpu_kfd_dev		kfd;

};



static inline uint32_t amdgpu_ip_version(const struct amdgpu_device *adev,

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

+5 −3
Original line number Diff line number Diff line
@@ -107,11 +107,13 @@ struct amdgpu_kfd_dev { 
	bool init_complete;

	struct work_struct reset_work;



	/* HMM page migration MEMORY_DEVICE_PRIVATE mapping */

	struct dev_pagemap pgmap;



	/* Client for KFD BO GEM handle allocations */

	struct drm_client_dev client;



	/* HMM page migration MEMORY_DEVICE_PRIVATE mapping

	 * Must be last --ends in a flexible-array member.

	 */

	struct dev_pagemap pgmap;

};



enum kgd_engine_type {

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

+32 −12
Original line number Diff line number Diff line
@@ -213,19 +213,35 @@ int amdgpu_amdkfd_reserve_mem_limit(struct amdgpu_device *adev, 
	spin_lock(&kfd_mem_limit.mem_limit_lock);



	if (kfd_mem_limit.system_mem_used + system_mem_needed >

	    kfd_mem_limit.max_system_mem_limit)

	    kfd_mem_limit.max_system_mem_limit) {

		pr_debug("Set no_system_mem_limit=1 if using shared memory\n");

		if (!no_system_mem_limit) {

			ret = -ENOMEM;

			goto release;

		}

	}



	if ((kfd_mem_limit.system_mem_used + system_mem_needed >

	     kfd_mem_limit.max_system_mem_limit && !no_system_mem_limit) ||

	    (kfd_mem_limit.ttm_mem_used + ttm_mem_needed >

	     kfd_mem_limit.max_ttm_mem_limit) ||

	    (adev && xcp_id >= 0 && adev->kfd.vram_used[xcp_id] + vram_needed >

	     vram_size - reserved_for_pt - reserved_for_ras - atomic64_read(&adev->vram_pin_size))) {

	if (kfd_mem_limit.ttm_mem_used + ttm_mem_needed >

		kfd_mem_limit.max_ttm_mem_limit) {

		ret = -ENOMEM;

		goto release;

	}



	/*if is_app_apu is false and apu_prefer_gtt is true, it is an APU with

	 * carve out < gtt. In that case, VRAM allocation will go to gtt domain, skip

	 * VRAM check since ttm_mem_limit check already cover this allocation

	 */



	if (adev && xcp_id >= 0 && (!adev->apu_prefer_gtt || adev->gmc.is_app_apu)) {

		uint64_t vram_available =

			vram_size - reserved_for_pt - reserved_for_ras -

			atomic64_read(&adev->vram_pin_size);

		if (adev->kfd.vram_used[xcp_id] + vram_needed > vram_available) {

			ret = -ENOMEM;

			goto release;

		}

	}



	/* Update memory accounting by decreasing available system

	 * memory, TTM memory and GPU memory as computed above

	 */
@@ -1627,6 +1643,10 @@ size_t amdgpu_amdkfd_get_available_memory(struct amdgpu_device *adev, 
	uint64_t vram_available, system_mem_available, ttm_mem_available;



	spin_lock(&kfd_mem_limit.mem_limit_lock);

	if (adev->apu_prefer_gtt && !adev->gmc.is_app_apu)

		vram_available = KFD_XCP_MEMORY_SIZE(adev, xcp_id)

			- adev->kfd.vram_used_aligned[xcp_id];

	else

		vram_available = KFD_XCP_MEMORY_SIZE(adev, xcp_id)

			- adev->kfd.vram_used_aligned[xcp_id]

			- atomic64_read(&adev->vram_pin_size)

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

+30 −3
Original line number Diff line number Diff line
@@ -1816,16 +1816,43 @@ static ssize_t amdgpu_atombios_get_vbios_version(struct device *dev, 
	return sysfs_emit(buf, "%s\n", ctx->vbios_pn);

}



static ssize_t amdgpu_atombios_get_vbios_build(struct device *dev,

					       struct device_attribute *attr,

					       char *buf)

{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(ddev);

	struct atom_context *ctx = adev->mode_info.atom_context;



	return sysfs_emit(buf, "%s\n", ctx->build_num);

}



static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version,

		   NULL);

static DEVICE_ATTR(vbios_build, 0444, amdgpu_atombios_get_vbios_build, NULL);



static struct attribute *amdgpu_vbios_version_attrs[] = {

	&dev_attr_vbios_version.attr,

	NULL

	&dev_attr_vbios_version.attr, &dev_attr_vbios_build.attr, NULL

};



static umode_t amdgpu_vbios_version_attrs_is_visible(struct kobject *kobj,

						     struct attribute *attr,

						     int index)

{

	struct device *dev = kobj_to_dev(kobj);

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(ddev);

	struct atom_context *ctx = adev->mode_info.atom_context;



	if (attr == &dev_attr_vbios_build.attr && !strlen(ctx->build_num))

		return 0;



	return attr->mode;

}



const struct attribute_group amdgpu_vbios_version_attr_group = {

	.attrs = amdgpu_vbios_version_attrs

	.attrs = amdgpu_vbios_version_attrs,

	.is_visible = amdgpu_vbios_version_attrs_is_visible,

};



int amdgpu_atombios_sysfs_init(struct amdgpu_device *adev)