Commit 1216d491 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.6-2023-09-13' of... 

Merge tag 'amd-drm-fixes-6.6-2023-09-13' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.6-2023-09-13:

amdgpu:
- GC 9.4.3 fixes
- Fix white screen issues with S/G display on system with >= 64G of ram
- Replay fixes
- SMU 13.0.6 fixes
- AUX backlight fix
- NBIO 4.3 SR-IOV fixes for HDP
- RAS fixes
- DP MST resume fix
- Fix segfault on systems with no vbios
- DPIA fixes

amdkfd:
- CWSR grace period fix
- Unaligned doorbell fix
- CRIU fix for GFX11
- Add missing TLB flush on gfx10 and newer

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230913195009.7714-1-alexander.deucher@amd.com
parents 15794f9d edcfe229

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

+0 −1
Original line number Diff line number Diff line
@@ -1293,7 +1293,6 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);

int amdgpu_device_pci_reset(struct amdgpu_device *adev);

bool amdgpu_device_need_post(struct amdgpu_device *adev);

bool amdgpu_sg_display_supported(struct amdgpu_device *adev);

bool amdgpu_device_pcie_dynamic_switching_supported(void);

bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev);

bool amdgpu_device_aspm_support_quirk(void);

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

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ void amdgpu_amdkfd_get_cu_info(struct amdgpu_device *adev, struct kfd_cu_info *c 
	cu_info->cu_active_number = acu_info.number;

	cu_info->cu_ao_mask = acu_info.ao_cu_mask;

	memcpy(&cu_info->cu_bitmap[0], &acu_info.bitmap[0],

	       sizeof(acu_info.bitmap));

	       sizeof(cu_info->cu_bitmap));

	cu_info->num_shader_engines = adev->gfx.config.max_shader_engines;

	cu_info->num_shader_arrays_per_engine = adev->gfx.config.max_sh_per_se;

	cu_info->num_cu_per_sh = adev->gfx.config.max_cu_per_sh;

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

+1 −2
Original line number Diff line number Diff line
@@ -980,8 +980,7 @@ void kgd_gfx_v10_build_grace_period_packet_info(struct amdgpu_device *adev, 
						uint32_t wait_times,

						uint32_t grace_period,

						uint32_t *reg_offset,

						uint32_t *reg_data,

						uint32_t inst)

						uint32_t *reg_data)

{

	*reg_data = wait_times;

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

+1 −2
Original line number Diff line number Diff line
@@ -55,5 +55,4 @@ void kgd_gfx_v10_build_grace_period_packet_info(struct amdgpu_device *adev, 
					       uint32_t wait_times,

					       uint32_t grace_period,

					       uint32_t *reg_offset,

					       uint32_t *reg_data,

					       uint32_t inst);
 
					       uint32_t *reg_data);

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

+2 −4
Original line number Diff line number Diff line
@@ -1103,8 +1103,7 @@ void kgd_gfx_v9_build_grace_period_packet_info(struct amdgpu_device *adev, 
		uint32_t wait_times,

		uint32_t grace_period,

		uint32_t *reg_offset,

		uint32_t *reg_data,

		uint32_t inst)

		uint32_t *reg_data)

{

	*reg_data = wait_times;
@@ -1120,8 +1119,7 @@ void kgd_gfx_v9_build_grace_period_packet_info(struct amdgpu_device *adev, 
			SCH_WAVE,

			grace_period);



	*reg_offset = SOC15_REG_OFFSET(GC, GET_INST(GC, inst),

			mmCP_IQ_WAIT_TIME2);

	*reg_offset = SOC15_REG_OFFSET(GC, 0, mmCP_IQ_WAIT_TIME2);

}



void kgd_gfx_v9_program_trap_handler_settings(struct amdgpu_device *adev,