Commit 342f141b authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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

 into drm-next

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

amdgpu:
- Fence drv clean up fix
- DPC fixes
- Misc display fixes
- Support the MMIO remap page as a ttm pool
- JPEG parser updates
- UserQ updates
- VCN ctx handling fixes
- Documentation updates
- Misc cleanups
- SMU 13.0.x updates
- SI DPM updates
- GC 11.x cleaner shader updates
- DMCUB updates
- DML fixes
- Improve fallback handling for pixel encoding
- VCN reset improvements
- DCE6 DC updates
- DSC fixes
- Use devm for i2c buses
- GPUVM locking updates
- GPUVM documentation improvements
- Drop non-DC DCE11 code
- S0ix fixes
- Backlight fix
- SR-IOV fixes

amdkfd:
- SVM updates

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://lore.kernel.org/r/20250919193354.2989255-1-alexander.deucher@amd.com
parents 0faeb8cf a490c8d7

Documentation/gpu/amdgpu/apu-asic-info-table.csv

+1 −0
Original line number Diff line number Diff line
@@ -13,5 +13,6 @@ Ryzen 7x20 series, Mendocino, 3.1.6, 10.3.7, 3.1.1, 5.2.7, 13.0.8, 13.0.8 
Ryzen 7x40 series, Phoenix, 3.1.4, 11.0.1 / 11.0.4, 4.0.2, 6.0.1, 13.0.4 / 13.0.11, 13.0.4 / 13.0.11

Ryzen 8x40 series, Hawk Point, 3.1.4, 11.0.1 / 11.0.4, 4.0.2, 6.0.1, 13.0.4 / 13.0.11, 13.0.4 / 13.0.11

Ryzen AI 300 series, Strix Point, 3.5.0, 11.5.0, 4.0.5, 6.1.0, 14.0.0, 14.0.0

Ryzen AI 330 series, Krackan Point, 3.6.0, 11.5.3, 4.0.5, 6.1.3, 14.0.5, 14.0.5

Ryzen AI 350 series, Krackan Point, 3.5.0, 11.5.2, 4.0.5, 6.1.2, 14.0.4, 14.0.4

Ryzen AI Max 300 series, Strix Halo, 3.5.1, 11.5.1, 4.0.6, 6.1.1, 14.0.1, 14.0.1

Documentation/gpu/amdgpu/driver-core.rst

+1 −1
Original line number Diff line number Diff line
@@ -210,4 +210,4 @@ IP Blocks 
   :doc: IP Blocks



.. kernel-doc:: drivers/gpu/drm/amd/include/amd_shared.h

   :identifiers: amd_ip_block_type amd_ip_funcs DC_DEBUG_MASK
 
   :identifiers: amd_ip_block_type amd_ip_funcs DC_FEATURE_MASK DC_DEBUG_MASK

drivers/gpu/drm/amd/amdgpu/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ amdgpu-y += \ 
# add DCE block

amdgpu-y += \

	dce_v10_0.o \

	dce_v11_0.o \

	amdgpu_vkms.o



# add GFX block

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

+4 −3
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include "kgd_pp_interface.h"



#include "amd_shared.h"

#include "amdgpu_utils.h"

#include "amdgpu_mode.h"

#include "amdgpu_ih.h"

#include "amdgpu_irq.h"
@@ -434,7 +435,6 @@ struct amdgpu_clock { 
	uint32_t default_mclk;

	uint32_t default_sclk;

	uint32_t default_dispclk;

	uint32_t current_dispclk;

	uint32_t dp_extclk;

	uint32_t max_pixel_clock;

};
@@ -545,7 +545,7 @@ struct amdgpu_wb { 
	 * this value can be accessed directly by using the offset as an index.

	 * For the GPU address, it is necessary to use gpu_addr and the offset.

	 */

	volatile uint32_t	*wb;

	uint32_t		*wb;



	/**

	 * @gpu_addr:
@@ -721,7 +721,7 @@ int amdgpu_cs_wait_fences_ioctl(struct drm_device *dev, void *data, 
/* VRAM scratch page for HDP bug, default vram page */

struct amdgpu_mem_scratch {

	struct amdgpu_bo		*robj;

	volatile uint32_t		*ptr;

	uint32_t			*ptr;

	u64				gpu_addr;

};
@@ -752,6 +752,7 @@ typedef void (*amdgpu_block_wreg_t)(struct amdgpu_device*, uint32_t, uint32_t, u 
struct amdgpu_mmio_remap {

	u32 reg_offset;

	resource_size_t bus_addr;

	struct amdgpu_bo *bo;

};



/* Define the HW IP blocks will be used in driver , add more if necessary */

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

+12 −4
Original line number Diff line number Diff line
@@ -250,16 +250,24 @@ void amdgpu_amdkfd_interrupt(struct amdgpu_device *adev, 


void amdgpu_amdkfd_suspend(struct amdgpu_device *adev, bool suspend_proc)

{

	if (adev->kfd.dev)

	if (adev->kfd.dev) {

		if (adev->in_s0ix)

			kgd2kfd_stop_sched_all_nodes(adev->kfd.dev);

		else

			kgd2kfd_suspend(adev->kfd.dev, suspend_proc);

	}

}



int amdgpu_amdkfd_resume(struct amdgpu_device *adev, bool resume_proc)

{

	int r = 0;



	if (adev->kfd.dev)

	if (adev->kfd.dev) {

		if (adev->in_s0ix)

			r = kgd2kfd_start_sched_all_nodes(adev->kfd.dev);

		else

			r = kgd2kfd_resume(adev->kfd.dev, resume_proc);

	}



	return r;

}