Commit 40d47c5f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.9-2024-02-19' of https://gitlab.freedesktop.org/agd5f/linux into drm-next 



amd-drm-next-6.9-2024-02-19:

amdgpu:
- ATHUB 4.1 support
- EEPROM support updates
- RAS updates
- LSDMA 7.0 support
- JPEG DPG support
- IH 7.0 support
- HDP 7.0 support
- VCN 5.0 support
- Misc display fixes
- Retimer fixes
- DCN 3.5 fixes
- VCN 4.x fixes
- PSR fixes
- PSP 14.0 support
- VA_RESERVED cleanup
- SMU 13.0.6 updates
- NBIO 7.11 updates
- SDMA 6.1 updates
- MMHUB 3.3 updates
- Suspend/resume fixes
- DMUB updates

amdkfd:
- Trap handler enhancements
- Fix cache size reporting
- Relocate the trap handler

radeon:
- fix typo in print statement

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240219214810.4911-1-alexander.deucher@amd.com
parents 9ac4beb7 31e0a586

drivers/gpu/drm/amd/amdgpu/Makefile

+10 −5
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ amdgpu-y += \ 
	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 \

	nbio_v7_9.o aqua_vanjaram.o nbio_v7_11.o

	nbio_v7_9.o aqua_vanjaram.o nbio_v7_11.o lsdma_v7_0.o hdp_v7_0.o



# add DF block

amdgpu-y += \
@@ -132,7 +132,8 @@ amdgpu-y += \ 
	vega20_ih.o \

	navi10_ih.o \

	ih_v6_0.o \

	ih_v6_1.o

	ih_v6_1.o \

	ih_v7_0.o



# add PSP block

amdgpu-y += \
@@ -143,7 +144,8 @@ amdgpu-y += \ 
	psp_v11_0_8.o \

	psp_v12_0.o \

	psp_v13_0.o \

	psp_v13_0_4.o

	psp_v13_0_4.o \

	psp_v14_0.o



# add DCE block

amdgpu-y += \
@@ -208,6 +210,7 @@ amdgpu-y += \ 
	vcn_v4_0.o \

	vcn_v4_0_3.o \

	vcn_v4_0_5.o \

	vcn_v5_0_0.o \

	amdgpu_jpeg.o \

	jpeg_v1_0.o \

	jpeg_v2_0.o \
@@ -215,7 +218,8 @@ amdgpu-y += \ 
	jpeg_v3_0.o \

	jpeg_v4_0.o \

	jpeg_v4_0_3.o \

	jpeg_v4_0_5.o

	jpeg_v4_0_5.o \

	jpeg_v5_0_0.o



# add VPE block

amdgpu-y += \
@@ -233,7 +237,8 @@ amdgpu-y += \ 
	athub_v1_0.o \

	athub_v2_0.o \

	athub_v2_1.o \

	athub_v3_0.o

	athub_v3_0.o \

	athub_v4_1_0.o



# add SMUIO block

amdgpu-y += \

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

+5 −1
Original line number Diff line number Diff line
@@ -196,8 +196,9 @@ extern int amdgpu_smu_pptable_id; 
extern uint amdgpu_dc_feature_mask;

extern uint amdgpu_dc_debug_mask;

extern uint amdgpu_dc_visual_confirm;

extern uint amdgpu_dm_abm_level;

extern int amdgpu_dm_abm_level;

extern int amdgpu_backlight;

extern int amdgpu_damage_clips;

extern struct amdgpu_mgpu_info mgpu_info;

extern int amdgpu_ras_enable;

extern uint amdgpu_ras_mask;
@@ -1095,6 +1096,7 @@ struct amdgpu_device { 
	long				sdma_timeout;

	long				video_timeout;

	long				compute_timeout;

	long				psp_timeout;



	uint64_t			unique_id;

	uint64_t	df_perfmon_config_assign_mask[AMDGPU_MAX_DF_PERFMONS];
@@ -1551,9 +1553,11 @@ static inline int amdgpu_acpi_smart_shift_update(struct drm_device *dev, 
#if defined(CONFIG_ACPI) && defined(CONFIG_SUSPEND)

bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);

void amdgpu_choose_low_power_state(struct amdgpu_device *adev);

#else

static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }

static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }

static inline void amdgpu_choose_low_power_state(struct amdgpu_device *adev) { }

#endif



#if defined(CONFIG_DRM_AMD_DC)

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

+15 −0
Original line number Diff line number Diff line
@@ -1519,4 +1519,19 @@ bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) 
#endif /* CONFIG_AMD_PMC */

}



/**

 * amdgpu_choose_low_power_state

 *

 * @adev: amdgpu_device_pointer

 *

 * Choose the target low power state for the GPU

 */

void amdgpu_choose_low_power_state(struct amdgpu_device *adev)

{

	if (amdgpu_acpi_is_s0ix_active(adev))

		adev->in_s0ix = true;

	else if (amdgpu_acpi_is_s3_active(adev))

		adev->in_s3 = true;

}



#endif /* CONFIG_SUSPEND */

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

+1 −2
Original line number Diff line number Diff line
@@ -28,9 +28,8 @@ 


uint64_t amdgpu_csa_vaddr(struct amdgpu_device *adev)

{

	uint64_t addr = adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT;

	uint64_t addr = AMDGPU_VA_RESERVED_CSA_START(adev);



	addr -= AMDGPU_VA_RESERVED_CSA_SIZE;

	addr = amdgpu_gmc_sign_extend(addr);



	return addr;

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

+9 −3
Original line number Diff line number Diff line
@@ -4529,13 +4529,15 @@ int amdgpu_device_prepare(struct drm_device *dev) 
	struct amdgpu_device *adev = drm_to_adev(dev);

	int i, r;



	amdgpu_choose_low_power_state(adev);



	if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)

		return 0;



	/* Evict the majority of BOs before starting suspend sequence */

	r = amdgpu_device_evict_resources(adev);

	if (r)

		return r;

		goto unprepare;



	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (!adev->ip_blocks[i].status.valid)
@@ -4544,10 +4546,15 @@ int amdgpu_device_prepare(struct drm_device *dev) 
			continue;

		r = adev->ip_blocks[i].version->funcs->prepare_suspend((void *)adev);

		if (r)

			return r;

			goto unprepare;

	}



	return 0;



unprepare:

	adev->in_s0ix = adev->in_s3 = false;



	return r;

}



/**
@@ -4584,7 +4591,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 
		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, true);



	cancel_delayed_work_sync(&adev->delayed_init_work);

	flush_delayed_work(&adev->gfx.gfx_off_delay_work);



	amdgpu_ras_suspend(adev);