Commit 52456a62 authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge tag 'amd-drm-fixes-6.19-2026-01-15' of... 

Merge tag 'amd-drm-fixes-6.19-2026-01-15' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.19-2026-01-15:

amdgpu:
- GC 9 PTE mtype fix
- Non-DC display kernel panic helper fix
- Merge fix
- GART vram access fix
- Userq fixes
- PSR debugging fix
- HDMI fixes
- Backlight fix
- SMU 14 fix
- TLB flush fixes

amdkfd:
- KFD node cleanup for eGPU disconnect
- Memory leak fix
- MES evict process fix

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

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

+2 −0
Original line number Diff line number Diff line
@@ -274,6 +274,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_device.c

+8 −0
Original line number Diff line number Diff line
@@ -5063,6 +5063,14 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 


	amdgpu_ttm_set_buffer_funcs_status(adev, false);



	/*

	 * device went through surprise hotplug; we need to destroy topology

	 * before ip_fini_early to prevent kfd locking refcount issues by calling

	 * amdgpu_amdkfd_suspend()

	 */

	if (drm_dev_is_unplugged(adev_to_drm(adev)))

		amdgpu_amdkfd_device_fini_sw(adev);



	amdgpu_device_ip_fini_early(adev);



	amdgpu_irq_fini_hw(adev);

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

+6 −1
Original line number Diff line number Diff line
@@ -1880,7 +1880,12 @@ int amdgpu_display_get_scanout_buffer(struct drm_plane *plane, 
				      struct drm_scanout_buffer *sb)

{

	struct amdgpu_bo *abo;

	struct drm_framebuffer *fb = plane->state->fb;

	struct drm_framebuffer *fb;



	if (drm_drv_uses_atomic_modeset(plane->dev))

		fb = plane->state->fb;

	else

		fb = plane->fb;



	if (!fb)

		return -EINVAL;

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

+0 −12
Original line number Diff line number Diff line
@@ -83,18 +83,6 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, 
	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	int r;



	/*

	 * Disable peer-to-peer access for DCC-enabled VRAM surfaces on GFX12+.

	 * Such buffers cannot be safely accessed over P2P due to device-local

	 * compression metadata. Fallback to system-memory path instead.

	 * Device supports GFX12 (GC 12.x or newer)

	 * BO was created with the AMDGPU_GEM_CREATE_GFX12_DCC flag

	 *

	 */

	if (amdgpu_ip_version(adev, GC_HWIP, 0) >= IP_VERSION(12, 0, 0) &&

	    bo->flags & AMDGPU_GEM_CREATE_GFX12_DCC)

		attach->peer2peer = false;



	/*

	 * Disable peer-to-peer access for DCC-enabled VRAM surfaces on GFX12+.

	 * Such buffers cannot be safely accessed over P2P due to device-local

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

+11 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ int amdgpu_damage_clips = -1; /* auto */ 
int amdgpu_umsch_mm_fwlog;

int amdgpu_rebar = -1; /* auto */

int amdgpu_user_queue = -1;

uint amdgpu_hdmi_hpd_debounce_delay_ms;



DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0,

			"DRM_UT_CORE",
@@ -1123,6 +1124,16 @@ module_param_named(rebar, amdgpu_rebar, int, 0444); 
MODULE_PARM_DESC(user_queue, "Enable user queues (-1 = auto (default), 0 = disable, 1 = enable, 2 = enable UQs and disable KQs)");

module_param_named(user_queue, amdgpu_user_queue, int, 0444);



/*

 * DOC: hdmi_hpd_debounce_delay_ms (uint)

 * HDMI HPD disconnect debounce delay in milliseconds.

 *

 * Used to filter short disconnect->reconnect HPD toggles some HDMI sinks

 * generate while entering/leaving power save. Set to 0 to disable by default.

 */

MODULE_PARM_DESC(hdmi_hpd_debounce_delay_ms, "HDMI HPD disconnect debounce delay in milliseconds (0 to disable (by default), 1500 is common)");

module_param_named(hdmi_hpd_debounce_delay_ms, amdgpu_hdmi_hpd_debounce_delay_ms, uint, 0644);



/* These devices are not supported by amdgpu.

 * They are supported by the mach64, r128, radeon drivers

 */