Commit 9a91e5e0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.14-2021-05-21' of... 

Merge tag 'amd-drm-next-5.14-2021-05-21' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-5.14-2021-05-21:

amdgpu:
- RAS fixes
- SR-IOV fixes
- More BO management cleanups
- Aldebaran fixes
- Display fixes
- Support for new GPU, Beige Goby
- Backlight fixes

amdkfd:
- RAS fixes
- DMA mapping fixes
- HMM 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/20210521045743.4047-1-alexander.deucher@amd.com
parents c99c4d0c 81db370c

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ amdgpu-y += \ 
	vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \

	vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o navi10_reg_init.o navi14_reg_init.o \

	arct_reg_init.o navi12_reg_init.o mxgpu_nv.o sienna_cichlid_reg_init.o vangogh_reg_init.o \

	nbio_v7_2.o dimgrey_cavefish_reg_init.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o aldebaran.o

	nbio_v7_2.o dimgrey_cavefish_reg_init.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o aldebaran.o \

	beige_goby_reg_init.o



# add DF block

amdgpu-y += \

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

+2 −2
Original line number Diff line number Diff line
@@ -670,10 +670,10 @@ int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t vmid) 
	return 0;

}



int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid)

int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid,

				      enum TLB_FLUSH_TYPE flush_type)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;

	const uint32_t flush_type = 0;

	bool all_hub = false;



	if (adev->family == AMDGPU_FAMILY_AI)

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

+21 −6
Original line number Diff line number Diff line
@@ -36,13 +36,26 @@ 


extern uint64_t amdgpu_amdkfd_total_mem_size;



enum TLB_FLUSH_TYPE {

	TLB_FLUSH_LEGACY = 0,

	TLB_FLUSH_LIGHTWEIGHT,

	TLB_FLUSH_HEAVYWEIGHT

};



struct amdgpu_device;



struct kfd_bo_va_list {

	struct list_head bo_list;

	struct amdgpu_bo_va *bo_va;

	void *kgd_dev;

enum kfd_mem_attachment_type {

	KFD_MEM_ATT_SHARED,	/* Share kgd_mem->bo or another attachment's */

	KFD_MEM_ATT_USERPTR,	/* SG bo to DMA map pages from a userptr bo */

	KFD_MEM_ATT_DMABUF,	/* DMAbuf to DMA map TTM BOs */

};



struct kfd_mem_attachment {

	struct list_head list;

	enum kfd_mem_attachment_type type;

	bool is_mapped;

	struct amdgpu_bo_va *bo_va;

	struct amdgpu_device *adev;

	uint64_t va;

	uint64_t pte_flags;

};
@@ -50,7 +63,8 @@ struct kfd_bo_va_list { 
struct kgd_mem {

	struct mutex lock;

	struct amdgpu_bo *bo;

	struct list_head bo_va_list;

	struct dma_buf *dmabuf;

	struct list_head attachments;

	/* protected by amdkfd_process_info.lock */

	struct ttm_validate_buffer validate_list;

	struct ttm_validate_buffer resv_list;
@@ -135,7 +149,8 @@ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine, 
void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle);

bool amdgpu_amdkfd_have_atomics_support(struct kgd_dev *kgd);

int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t vmid);

int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid);

int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid,

				      enum TLB_FLUSH_TYPE flush_type);



bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid);

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

+378 −161

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −0
Original line number Diff line number Diff line
@@ -1828,6 +1828,9 @@ int amdgpu_atombios_init(struct amdgpu_device *adev) 
	if (adev->is_atom_fw) {

		amdgpu_atomfirmware_scratch_regs_init(adev);

		amdgpu_atomfirmware_allocate_fb_scratch(adev);

		/* cached firmware_flags for further usage */

		adev->mode_info.firmware_flags =

			amdgpu_atomfirmware_query_firmware_capability(adev);

	} else {

		amdgpu_atombios_scratch_regs_init(adev);

		amdgpu_atombios_allocate_fb_scratch(adev);