Commit f67d54e9 authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge tag 'amd-drm-next-6.19-2025-10-29' of... 

Merge tag 'amd-drm-next-6.19-2025-10-29' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-6.19-2025-10-29:

amdgpu:
- VPE idle handler fix
- Re-enable DM idle optimizations
- DCN3.0 fix
- SMU fix
- Powerplay fixes for fiji/iceland
- License copy-pasta fixes
- HDP eDP panel fix
- Vblank fix
- RAS fixes
- SR-IOV updates
- SMU 13 VCN reset fix
- DMUB fixes
- DC frame limit fix
- Additional DC underflow logging
- DCN 3.1.5 fixes
- DC Analog encoders support
- Enable DC on bonaire by default
- UserQ fixes
- Remove redundant pm_runtime_mark_last_busy() calls

amdkfd:
- Process cleanup fix
- Misc fixes

radeon:
- devm migration fixes
- Remove redundant pm_runtime_mark_last_busy() calls

UAPI
- Add ABM KMS property
  Proposed kwin changes: https://invent.kde.org/plasma/kwin/-/merge_requests/6028



Signed-off-by: default avatarSimona Vetter <simona.vetter@ffwll.ch>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20251029205713.9480-1-alexander.deucher@amd.com
parents dc1af502 1bc9d392

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

+6 −2
Original line number Diff line number Diff line
@@ -1176,6 +1176,12 @@ struct amdgpu_device { 
	 * queue fence.

	 */

	struct xarray			userq_xa;

	/**

	 * @userq_doorbell_xa: Global user queue map (doorbell index → queue)

	 * Key: doorbell_index (unique global identifier for the queue)

	 * Value: struct amdgpu_usermode_queue

	 */

	struct xarray userq_doorbell_xa;



	/* df */

	struct amdgpu_df                df;
@@ -1309,8 +1315,6 @@ struct amdgpu_device { 
	 */

	bool                            apu_prefer_gtt;



	struct list_head		userq_mgr_list;

	struct mutex                    userq_mutex;

	bool                            userq_halt_for_enforce_isolation;

	struct amdgpu_uid *uid_info;

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

+0 −1
Original line number Diff line number Diff line
@@ -507,7 +507,6 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, 
				pm_runtime_get_sync(adev_to_drm(adev)->dev);

				/* Just fire off a uevent and let userspace tell us what to do */

				drm_helper_hpd_irq_event(adev_to_drm(adev));

				pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

				pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			}

		}

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

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static bool amdgpu_read_bios_from_vram(struct amdgpu_device *adev) 
{

	uint8_t __iomem *bios = NULL;

	resource_size_t vram_base;

	resource_size_t size = 256 * 1024; /* ??? */

	u32 size = 256U * 1024U; /* ??? */



	if (!(adev->flags & AMD_IS_APU))

		if (amdgpu_device_need_post(adev))
@@ -126,7 +126,7 @@ static bool amdgpu_read_bios_from_vram(struct amdgpu_device *adev) 
	 */

	if (amdgpu_sriov_vf(adev) && adev->virt.is_dynamic_crit_regn_enabled) {

		if (amdgpu_virt_get_dynamic_data_info(adev,

				AMD_SRIOV_MSG_VBIOS_IMG_TABLE_ID, adev->bios, (uint64_t *)&size)) {

				AMD_SRIOV_MSG_VBIOS_IMG_TABLE_ID, adev->bios, &size)) {

			amdgpu_bios_release(adev);

			return false;

		}

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

+4 −12
Original line number Diff line number Diff line
@@ -734,10 +734,8 @@ amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force) 


	amdgpu_connector_update_scratch_regs(connector, ret);



	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

	if (!drm_kms_helper_is_poll_worker())

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	return ret;

}
@@ -919,10 +917,8 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force) 
	amdgpu_connector_update_scratch_regs(connector, ret);



out:

	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

	if (!drm_kms_helper_is_poll_worker())

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	return ret;

}
@@ -1146,10 +1142,8 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force) 
	amdgpu_connector_update_scratch_regs(connector, ret);



exit:

	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

	if (!drm_kms_helper_is_poll_worker())

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	return ret;

}
@@ -1486,10 +1480,8 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force) 


	amdgpu_connector_update_scratch_regs(connector, ret);

out:

	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

	if (!drm_kms_helper_is_poll_worker())

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||

	    connector->connector_type == DRM_MODE_CONNECTOR_eDP)

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

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// SPDX-License-Identifier: MIT

/*

 * Copyright 2025 Advanced Micro Devices, Inc.

 *