Commit 1138398d authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'amd-drm-next-6.4-2023-03-31' of https://gitlab.freedesktop.org/agd5f/linux into drm-next 



amd-drm-next-6.4-2023-03-31:

amdgpu:
- Misc code cleanups
- S4 fixes
- MES fixes
- SR-IOV fixes
- Link DC backlight to connector device rather than PCI device
- W=1 fixes
- ASPM quirk
- RAS fixes
- DC dynamic split fixes and enablement for remaining chips
- Navi1x SMU fix
- Initial NBIO 7.9 support
- Initial GC 9.4.3 support
- Initial GFXHUB 1.2 support
- Initial MMHUB 1.8 support
- DCN 3.1.5 fixes
- Initial DC FAMs infrastructure
- Add support for 6.75Gbps link rates
- Add sysfs nodes for secondary VCN clocks

amdkfd:
- Initial support for GC 9.4.3

radeon:
- Convert to client-based fbdev emulation

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230331221955.7896-1-alexander.deucher@amd.com
parents 63758fec feae1bd8

drivers/gpu/drm/amd/amdgpu/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ amdgpu-y += \ 
	vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \

	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 \

	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

	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



# add DF block

amdgpu-y += \
@@ -92,7 +93,7 @@ amdgpu-y += \ 
	gfxhub_v1_0.o mmhub_v1_0.o gmc_v9_0.o gfxhub_v1_1.o mmhub_v9_4.o \

	gfxhub_v2_0.o mmhub_v2_0.o gmc_v10_0.o gfxhub_v2_1.o mmhub_v2_3.o \

	mmhub_v1_7.o gfxhub_v3_0.o mmhub_v3_0.o mmhub_v3_0_2.o gmc_v11_0.o \

	mmhub_v3_0_1.o gfxhub_v3_0_3.o

	mmhub_v3_0_1.o gfxhub_v3_0_3.o gfxhub_v1_2.o mmhub_v1_8.o



# add UMC block

amdgpu-y += \

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

+7 −3
Original line number Diff line number Diff line
@@ -3181,9 +3181,11 @@ static int amdgpu_device_ip_reinit_late_sriov(struct amdgpu_device *adev) 
		AMD_IP_BLOCK_TYPE_DCE,

		AMD_IP_BLOCK_TYPE_GFX,

		AMD_IP_BLOCK_TYPE_SDMA,

		AMD_IP_BLOCK_TYPE_MES,

		AMD_IP_BLOCK_TYPE_UVD,

		AMD_IP_BLOCK_TYPE_VCE,

		AMD_IP_BLOCK_TYPE_VCN

		AMD_IP_BLOCK_TYPE_VCN,

		AMD_IP_BLOCK_TYPE_JPEG

	};



	for (i = 0; i < ARRAY_SIZE(ip_order); i++) {
@@ -5176,6 +5178,7 @@ static inline void amdgpu_device_stop_pending_resets(struct amdgpu_device *adev) 
 *

 * @adev: amdgpu_device pointer

 * @job: which job trigger hang

 * @reset_context: amdgpu reset context pointer

 *

 * Attempt to reset the GPU if it has hung (all asics).

 * Attempt to do soft-reset or full-reset and reinitialize Asic
@@ -5345,8 +5348,9 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
		if (r)

			adev->asic_reset_res = r;



		/* Aldebaran supports ras in SRIOV, so need resume ras during reset */

		if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(9, 4, 2))

		/* Aldebaran and gfx_11_0_3 support ras in SRIOV, so need resume ras during reset */

		if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(9, 4, 2) ||

		    adev->ip_versions[GC_HWIP][0] == IP_VERSION(11, 0, 3))

			amdgpu_ras_resume(adev);

	} else {

		r = amdgpu_do_asic_reset(device_list_handle, reset_context);

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

+9 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "nbio_v6_1.h"

#include "nbio_v7_0.h"

#include "nbio_v7_4.h"

#include "nbio_v7_9.h"

#include "hdp_v4_0.h"

#include "vega10_ih.h"

#include "vega20_ih.h"
@@ -1546,6 +1547,7 @@ static int amdgpu_discovery_set_gmc_ip_blocks(struct amdgpu_device *adev) 
	case IP_VERSION(9, 4, 0):

	case IP_VERSION(9, 4, 1):

	case IP_VERSION(9, 4, 2):

	case IP_VERSION(9, 4, 3):

		amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block);

		break;

	case IP_VERSION(10, 1, 10):
@@ -1948,9 +1950,8 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev) 
		case IP_VERSION(4, 0, 2):

		case IP_VERSION(4, 0, 4):

			amdgpu_device_ip_block_add(adev, &vcn_v4_0_ip_block);

			if (!amdgpu_sriov_vf(adev))

			amdgpu_device_ip_block_add(adev, &jpeg_v4_0_ip_block);

			break;

			return 0;

		default:

			dev_err(adev->dev,

				"Failed to add vcn/jpeg ip block(UVD_HWIP:0x%x)\n",
@@ -2181,6 +2182,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev) 
	case IP_VERSION(9, 4, 0):

	case IP_VERSION(9, 4, 1):

	case IP_VERSION(9, 4, 2):

	case IP_VERSION(9, 4, 3):

		adev->family = AMDGPU_FAMILY_AI;

		break;

	case IP_VERSION(9, 1, 0):
@@ -2265,6 +2267,10 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev) 
		adev->nbio.funcs = &nbio_v7_4_funcs;

		adev->nbio.hdp_flush_reg = &nbio_v7_4_hdp_flush_reg;

		break;

	case IP_VERSION(7, 9, 0):

		adev->nbio.funcs = &nbio_v7_9_funcs;

		adev->nbio.hdp_flush_reg = &nbio_v7_9_hdp_flush_reg;

		break;

	case IP_VERSION(7, 2, 0):

	case IP_VERSION(7, 2, 1):

	case IP_VERSION(7, 3, 0):

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

+3 −3
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ uint amdgpu_pcie_lane_cap; 
u64 amdgpu_cg_mask = 0xffffffffffffffff;

uint amdgpu_pg_mask = 0xffffffff;

uint amdgpu_sdma_phase_quantum = 32;

char *amdgpu_disable_cu = NULL;

char *amdgpu_virtual_display = NULL;

char *amdgpu_disable_cu;

char *amdgpu_virtual_display;



/*

 * OverDrive(bit 14) disabled by default
@@ -822,7 +822,7 @@ MODULE_PARM_DESC(no_system_mem_limit, "disable system memory limit (false = defa 
 * DOC: no_queue_eviction_on_vm_fault (int)

 * If set, process queues will not be evicted on gpuvm fault. This is to keep the wavefront context for debugging (0 = queue eviction, 1 = no queue eviction). The default is 0 (queue eviction).

 */

int amdgpu_no_queue_eviction_on_vm_fault = 0;

int amdgpu_no_queue_eviction_on_vm_fault;

MODULE_PARM_DESC(no_queue_eviction_on_vm_fault, "No queue eviction on VM fault (0 = queue eviction, 1 = no queue eviction)");

module_param_named(no_queue_eviction_on_vm_fault, amdgpu_no_queue_eviction_on_vm_fault, int, 0444);

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -624,6 +624,7 @@ void amdgpu_gmc_noretry_set(struct amdgpu_device *adev) 
				gc_ver == IP_VERSION(9, 4, 0) ||

				gc_ver == IP_VERSION(9, 4, 1) ||

				gc_ver == IP_VERSION(9, 4, 2) ||

				gc_ver == IP_VERSION(9, 4, 3) ||

				gc_ver >= IP_VERSION(10, 3, 0));



	gmc->noretry = (amdgpu_noretry == -1) ? noretry_default : amdgpu_noretry;