Commit 72cfb835 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.18-2022-03-25' of... 

Merge tag 'amd-drm-next-5.18-2022-03-25' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-next-5.18-2022-03-25:

amdgpu:
- GFX 10.3.7 fixes
- noretry updates
- VCN fixes
- TMDS fix
- zstate fix for freesync video
- DCN 3.1.5 fix
- Display stack size fix
- Audio fix
- DCN 3.1 pstate fix
- TMZ VCN fix
- APU passthrough fix
- Misc other fixes

amdkfd:
- Error handling fix
- xgmi p2p fix
- HWS VMIDs fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220325183602.5718-1-alexander.deucher@amd.com
parents 31231092 15f9cd43

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

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ 
#define CONNECTOR_OBJECT_ID_eDP                   0x14

#define CONNECTOR_OBJECT_ID_MXM                   0x15

#define CONNECTOR_OBJECT_ID_LVDS_eDP              0x16

#define CONNECTOR_OBJECT_ID_USBC                  0x17



/* deleted */

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

+2 −2
Original line number Diff line number Diff line
@@ -5733,7 +5733,7 @@ void amdgpu_device_flush_hdp(struct amdgpu_device *adev, 
		struct amdgpu_ring *ring)

{

#ifdef CONFIG_X86_64

	if (adev->flags & AMD_IS_APU)

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

		return;

#endif

	if (adev->gmc.xgmi.connected_to_cpu)
@@ -5749,7 +5749,7 @@ void amdgpu_device_invalidate_hdp(struct amdgpu_device *adev, 
		struct amdgpu_ring *ring)

{

#ifdef CONFIG_X86_64

	if (adev->flags & AMD_IS_APU)

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

		return;

#endif

	if (adev->gmc.xgmi.connected_to_cpu)

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

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ MODULE_PARM_DESC(sched_policy, 
 * Maximum number of processes that HWS can schedule concurrently. The maximum is the

 * number of VMIDs assigned to the HWS, which is also the default.

 */

int hws_max_conc_proc = 8;

int hws_max_conc_proc = -1;

module_param(hws_max_conc_proc, int, 0444);

MODULE_PARM_DESC(hws_max_conc_proc,

	"Max # processes HWS can execute concurrently when sched_policy=0 (0 = no concurrency, #VMIDs for KFD = Maximum(default))");

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

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static int amdgpu_gfx_kiq_acquire(struct amdgpu_device *adev, 
		    * adev->gfx.mec.num_pipe_per_mec

		    * adev->gfx.mec.num_queue_per_pipe;



	while (queue_bit-- >= 0) {

	while (--queue_bit >= 0) {

		if (test_bit(queue_bit, adev->gfx.mec.queue_bitmap))

			continue;

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

+6 −0
Original line number Diff line number Diff line
@@ -561,9 +561,15 @@ void amdgpu_gmc_noretry_set(struct amdgpu_device *adev) 


	switch (adev->ip_versions[GC_HWIP][0]) {

	case IP_VERSION(9, 0, 1):

	case IP_VERSION(9, 3, 0):

	case IP_VERSION(9, 4, 0):

	case IP_VERSION(9, 4, 1):

	case IP_VERSION(9, 4, 2):

	case IP_VERSION(10, 3, 3):

	case IP_VERSION(10, 3, 4):

	case IP_VERSION(10, 3, 5):

	case IP_VERSION(10, 3, 6):

	case IP_VERSION(10, 3, 7):

		/*

		 * noretry = 0 will cause kfd page fault tests fail

		 * for some ASICs, so set default to 1 for these ASICs.