Commit 8f0284f1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.15-2021-08-27' of... 

Merge tag 'amd-drm-next-5.15-2021-08-27' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-5.15-2021-08-27:

amdgpu:
- PLL fix for SI
- Misc code cleanups
- RAS fixes
- PSP cleanups
- Polaris UVD/VCE suspend fixes
- aldebaran fixes
- DCN3.x mclk fixes

amdkfd:
- CWSR fixes for arcturus and aldebaran
- SVM fixes

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210827192336.4649-1-alexander.deucher@amd.com
parents 5bea1c8c 61d861cf

drivers/gpu/drm/amd/amdgpu/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \

	amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \

	amdgpu_fw_attestation.o amdgpu_securedisplay.o amdgpu_hdp.o \

	amdgpu_eeprom.o

	amdgpu_eeprom.o amdgpu_mca.o



amdgpu-$(CONFIG_PROC_FS) += amdgpu_fdinfo.o
@@ -189,6 +189,10 @@ amdgpu-y += \ 
amdgpu-y += \

	amdgpu_reset.o



# add MCA block

amdgpu-y += \

	mca_v3_0.o



# add amdkfd interfaces

amdgpu-y += amdgpu_amdkfd.o

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

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
#include "amdgpu_df.h"

#include "amdgpu_smuio.h"

#include "amdgpu_fdinfo.h"

#include "amdgpu_mca.h"



#define MAX_GPU_INSTANCE		16
@@ -1009,6 +1010,9 @@ struct amdgpu_device { 
	/* df */

	struct amdgpu_df                df;



	/* MCA */

	struct amdgpu_mca               mca;



	struct amdgpu_ip_block          ip_blocks[AMDGPU_MAX_IP_NUM];

	uint32_t		        harvest_ip_mask;

	int				num_ip_blocks;

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

+1 −1
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ void amdgpu_acpi_detect(void) 
 */

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev)

{

#if IS_ENABLED(CONFIG_AMD_PMC) && IS_ENABLED(CONFIG_PM_SLEEP)

#if IS_ENABLED(CONFIG_AMD_PMC) && IS_ENABLED(CONFIG_SUSPEND)

	if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) {

		if (adev->flags & AMD_IS_APU)

			return pm_suspend_target_state == PM_SUSPEND_TO_IDLE;

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

+1 −0
Original line number Diff line number Diff line
@@ -44,4 +44,5 @@ const struct kfd2kgd_calls aldebaran_kfd2kgd = { 
	.get_atc_vmid_pasid_mapping_info =

				kgd_gfx_v9_get_atc_vmid_pasid_mapping_info,

	.set_vm_context_page_table_base = kgd_gfx_v9_set_vm_context_page_table_base,

	.program_trap_handler_settings = kgd_gfx_v9_program_trap_handler_settings

};

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

+2 −1
Original line number Diff line number Diff line
@@ -305,5 +305,6 @@ const struct kfd2kgd_calls arcturus_kfd2kgd = { 
				kgd_gfx_v9_get_atc_vmid_pasid_mapping_info,

	.set_vm_context_page_table_base =

				kgd_gfx_v9_set_vm_context_page_table_base,

	.get_cu_occupancy = kgd_gfx_v9_get_cu_occupancy

	.get_cu_occupancy = kgd_gfx_v9_get_cu_occupancy,

	.program_trap_handler_settings = kgd_gfx_v9_program_trap_handler_settings

};