Commit 71e9f407 authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge tag 'amd-drm-next-6.11-2024-06-28' of... 

Merge tag 'amd-drm-next-6.11-2024-06-28' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-6.11-2024-06-28:

amdgpu:
- JPEG 5.x fixes
- More FW loading cleanups
- Misc code cleanups
- GC 12.x fixes
- ASPM fix
- DCN 4.0.1 updates
- SR-IOV fixes
- HDCP fix
- USB4 fixes
- Silence UBSAN warnings
- MES submission fixes
- Update documentation for new products
- DCC updates
- Initial ISP 4.x plumbing
- RAS fixes
- Misc small fixes

amdkfd:
- Fix missing unlock in error path for adding queues

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240628213135.427214-1-alexander.deucher@amd.com
parents 6256274c 15eb8573

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

+2 −0
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ SteamDeck, VANGOGH, DCN 3.0.1, 10.3.1, VCN 3.1.0, 5.2.1, 11.5.0 
Ryzen 5000 series / Ryzen 7x30 series, GREEN SARDINE / Cezanne / Barcelo / Barcelo-R, DCN 2.1, 9.3, VCN 2.2, 4.1.1, 12.0.1

Ryzen 6000 series / Ryzen 7x35 series / Ryzen 7x36 series, YELLOW CARP / Rembrandt / Rembrandt-R, 3.1.2, 10.3.3, VCN 3.1.1, 5.2.3, 13.0.3

Ryzen 7000 series (AM5), Raphael, 3.1.5, 10.3.6, 3.1.2, 5.2.6, 13.0.5

Ryzen 9000 series (AM5), Granite Ridge, 3.1.5, 10.3.6, 3.1.2, 5.2.6, 13.0.5

Ryzen 7x45 series (FL1), Dragon Range, 3.1.5, 10.3.6, 3.1.2, 5.2.6, 13.0.5

Ryzen 7x20 series, Mendocino, 3.1.6, 10.3.7, 3.1.1, 5.2.7, 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

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

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

drivers/gpu/drm/amd/amdgpu/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -71,6 +71,17 @@ config DRM_AMDGPU_USERPTR 
	  This option selects CONFIG_HMM and CONFIG_HMM_MIRROR if it

	  isn't already selected to enabled full userptr support.



config DRM_AMD_ISP

	bool "Enable AMD Image Signal Processor IP support"

	depends on DRM_AMDGPU

	select MFD_CORE

	select PM_GENERIC_DOMAINS if PM

	help

	Choose this option to enable ISP IP support for AMD SOCs.

	This adds the ISP (Image Signal Processor) IP driver and wires

	it up into the amdgpu driver.  It is required for cameras

	on APUs which utilize mipi cameras.



config DRM_AMDGPU_WERROR

	bool "Force the compiler to throw an error instead of a warning when compiling"

	depends on DRM_AMDGPU

drivers/gpu/drm/amd/amdgpu/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -323,4 +323,12 @@ amdgpu-y += $(AMD_DISPLAY_FILES) 


endif



# add isp block

ifneq ($(CONFIG_DRM_AMD_ISP),)

amdgpu-y += \

	amdgpu_isp.o \

	isp_v4_1_0.o \

	isp_v4_1_1.o

endif



obj-$(CONFIG_DRM_AMDGPU)+= amdgpu.o

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

+9 −2
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ 
#include "amdgpu_xcp.h"

#include "amdgpu_seq64.h"

#include "amdgpu_reg_state.h"

#if defined(CONFIG_DRM_AMD_ISP)

#include "amdgpu_isp.h"

#endif



#define MAX_GPU_INSTANCE		64
@@ -221,7 +224,6 @@ extern int amdgpu_mes; 
extern int amdgpu_mes_log_enable;

extern int amdgpu_mes_kiq;

extern int amdgpu_uni_mes;

extern int amdgpu_jpeg_test;

extern int amdgpu_noretry;

extern int amdgpu_force_asic_type;

extern int amdgpu_smartshift_bias;
@@ -721,6 +723,7 @@ enum amd_hw_ip_block_type { 
	XGMI_HWIP,

	DCI_HWIP,

	PCIE_HWIP,

	ISP_HWIP,

	MAX_HWIP

};
@@ -1018,7 +1021,6 @@ struct amdgpu_device { 


	/* jpeg */

	struct amdgpu_jpeg		jpeg;

	bool enable_jpeg_test;



	/* vpe */

	struct amdgpu_vpe		vpe;
@@ -1048,6 +1050,11 @@ struct amdgpu_device { 
	/* display related functionality */

	struct amdgpu_display_manager dm;



#if defined(CONFIG_DRM_AMD_ISP)

	/* isp */

	struct amdgpu_isp		isp;

#endif



	/* mes */

	bool                            enable_mes;

	bool                            enable_mes_kiq;

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

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, 
						mem_channel_number = vram_info->v30.channel_num;

						mem_channel_width = vram_info->v30.channel_width;

						if (vram_width)

							*vram_width = mem_channel_number * (1 << mem_channel_width);

							*vram_width = mem_channel_number * 16;

						break;

					default:

						return -EINVAL;