Commit 5493ee19 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.20-2022-07-29' of... 

Merge tag 'amd-drm-next-5.20-2022-07-29' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-5.20-2022-07-29:

amdgpu:
- Misc spelling and grammar fixes
- DC whitespace cleanups
- ACP smatch fix
- GFX 11.0 updates
- PSP 13.0 updates
- VCN 4.0 updates
- DC FP fix for PPC64
- Misc bug fixes

amdkfd:
- 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/20220729202742.6636-1-alexander.deucher@amd.com
parents 2bc7ea71 64f99159

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ amdgpu-y += \ 
	psp_v11_0.o \

	psp_v11_0_8.o \

	psp_v12_0.o \

	psp_v13_0.o

	psp_v13_0.o \

	psp_v13_0_4.o



# add DCE block

amdgpu-y += \

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

+1 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ struct amdgpu_device { 
	bool                            psp_sysfs_en;



	/* Chip product information */

	char				product_number[16];

	char				product_number[20];

	char				product_name[AMDGPU_PRODUCT_NAME_LEN];

	char				serial[20];

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

+0 −8
Original line number Diff line number Diff line
@@ -390,14 +390,6 @@ static int acp_hw_init(void *handle) 
		i2s_pdata[2].i2s_reg_comp1 = ACP_BT_COMP1_REG_OFFSET;

		i2s_pdata[2].i2s_reg_comp2 = ACP_BT_COMP2_REG_OFFSET;



		i2s_pdata[3].quirks = DW_I2S_QUIRK_COMP_REG_OFFSET;

		switch (adev->asic_type) {

		case CHIP_STONEY:

			i2s_pdata[3].quirks |= DW_I2S_QUIRK_16BIT_IDX_OVERRIDE;

			break;

		default:

			break;

		}

		adev->acp.acp_res[0].name = "acp2x_dma";

		adev->acp.acp_res[0].flags = IORESOURCE_MEM;

		adev->acp.acp_res[0].start = acp_base;

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

+7 −0
Original line number Diff line number Diff line
@@ -172,6 +172,9 @@ int amdgpu_queue_mask_bit_to_set_resource_bit(struct amdgpu_device *adev, 
struct amdgpu_amdkfd_fence *amdgpu_amdkfd_fence_create(u64 context,

				struct mm_struct *mm,

				struct svm_range_bo *svm_bo);

#if defined(CONFIG_DEBUG_FS)

int kfd_debugfs_kfd_mem_limits(struct seq_file *m, void *data);

#endif

#if IS_ENABLED(CONFIG_HSA_AMD)

bool amdkfd_fence_check_mm(struct dma_fence *f, struct mm_struct *mm);

struct amdgpu_amdkfd_fence *to_amdgpu_amdkfd_fence(struct dma_fence *f);
@@ -305,6 +308,10 @@ bool amdgpu_amdkfd_bo_mapped_to_dev(struct amdgpu_device *adev, struct kgd_mem * 
void amdgpu_amdkfd_block_mmu_notifications(void *p);

int amdgpu_amdkfd_criu_resume(void *p);

bool amdgpu_amdkfd_ras_query_utcl2_poison_status(struct amdgpu_device *adev);

int amdgpu_amdkfd_reserve_mem_limit(struct amdgpu_device *adev,

		uint64_t size, u32 alloc_flag);

void amdgpu_amdkfd_unreserve_mem_limit(struct amdgpu_device *adev,

		uint64_t size, u32 alloc_flag);



#if IS_ENABLED(CONFIG_HSA_AMD)

void amdgpu_amdkfd_gpuvm_init_mem_limits(void);

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

+6 −3
Original line number Diff line number Diff line
@@ -159,11 +159,14 @@ static void amdkfd_fence_release(struct dma_fence *f) 
}



/**

 * amdkfd_fence_check_mm - Check if @mm is same as that of the fence @f

 *  if same return TRUE else return FALSE.

 * amdkfd_fence_check_mm - Check whether to prevent eviction of @f by @mm

 *

 * @f: [IN] fence

 * @mm: [IN] mm that needs to be verified

 *

 * Check if @mm is same as that of the fence @f, if same return TRUE else

 * return FALSE.

 * For svm bo, which support vram overcommitment, always return FALSE.

 */

bool amdkfd_fence_check_mm(struct dma_fence *f, struct mm_struct *mm)

{
@@ -171,7 +174,7 @@ bool amdkfd_fence_check_mm(struct dma_fence *f, struct mm_struct *mm) 


	if (!fence)

		return false;

	else if (fence->mm == mm)

	else if (fence->mm == mm  && !fence->svm_bo)

		return true;



	return false;