Commit 078a3be7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.19-2022-06-29' of... 

Merge tag 'amd-drm-fixes-5.19-2022-06-29' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.19-2022-06-29:

amdgpu:
- GPU recovery fix
- Fix integer type usage in fourcc header for AMD modifiers
- KFD TLB flush fix for gfx9 APUs
- Display fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220629192220.5870-1-alexander.deucher@amd.com
parents 8cdf1b56 a775e4e4

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

+2 −1
Original line number Diff line number Diff line
@@ -714,7 +714,8 @@ int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct amdgpu_device *adev, 
{

	bool all_hub = false;



	if (adev->family == AMDGPU_FAMILY_AI)

	if (adev->family == AMDGPU_FAMILY_AI ||

	    adev->family == AMDGPU_FAMILY_RV)

		all_hub = true;



	return amdgpu_gmc_flush_gpu_tlb_pasid(adev, pasid, flush_type, all_hub);

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

+1 −1
Original line number Diff line number Diff line
@@ -5164,7 +5164,7 @@ int amdgpu_device_gpu_recover_imp(struct amdgpu_device *adev, 
		 */

		amdgpu_unregister_gpu_instance(tmp_adev);



		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, true);

		drm_fb_helper_set_suspend_unlocked(adev_to_drm(tmp_adev)->fb_helper, true);



		/* disable ras on ALL IPs */

		if (!need_emergency_restart &&

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

+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ int amdgpu_irq_init(struct amdgpu_device *adev) 
	if (!amdgpu_device_has_dc_support(adev)) {

		if (!adev->enable_virtual_display)

			/* Disable vblank IRQs aggressively for power-saving */

			/* XXX: can this be enabled for DC? */

			adev_to_drm(adev)->vblank_disable_immediate = true;



		r = drm_vblank_init(adev_to_drm(adev), adev->mode_info.num_crtc);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+0 −3
Original line number Diff line number Diff line
@@ -4259,9 +4259,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
		}

	}



	/* Disable vblank IRQs aggressively for power-saving. */

	adev_to_drm(adev)->vblank_disable_immediate = true;



	/* loops over all connectors on the board */

	for (i = 0; i < link_cnt; i++) {

		struct dc_link *link = NULL;

include/uapi/drm/drm_fourcc.h

+2 −2
Original line number Diff line number Diff line
@@ -1444,11 +1444,11 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) 
#define AMD_FMT_MOD_PIPE_MASK 0x7



#define AMD_FMT_MOD_SET(field, value) \

	((uint64_t)(value) << AMD_FMT_MOD_##field##_SHIFT)

	((__u64)(value) << AMD_FMT_MOD_##field##_SHIFT)

#define AMD_FMT_MOD_GET(field, value) \

	(((value) >> AMD_FMT_MOD_##field##_SHIFT) & AMD_FMT_MOD_##field##_MASK)

#define AMD_FMT_MOD_CLEAR(field) \

	(~((uint64_t)AMD_FMT_MOD_##field##_MASK << AMD_FMT_MOD_##field##_SHIFT))

	(~((__u64)AMD_FMT_MOD_##field##_MASK << AMD_FMT_MOD_##field##_SHIFT))



#if defined(__cplusplus)

}