Commit 585f2bc8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.1-2022-11-16' of... 

Merge tag 'amd-drm-fixes-6.1-2022-11-16' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.1-2022-11-16:

amdgpu:
- Fix a possible memory leak in ganng submit error path
- DP tunneling fixes
- DCN 3.1 page flip fix
- DCN 3.2.x fixes
- DCN 3.1.4 fixes
- Don't expose degamma on hardware that doesn't support it
- BACO fixes for SMU 11.x
- BACO fixes for SMU 13.x
- Virtual display fix for devices with no display hardware

amdkfd:
- Memory limit regression fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221117040416.6100-1-alexander.deucher@amd.com
parents a73b603f 4b14841c

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

+1 −0
Original line number Diff line number Diff line
@@ -1293,6 +1293,7 @@ void amdgpu_device_pcie_port_wreg(struct amdgpu_device *adev, 
				u32 reg, u32 v);

struct dma_fence *amdgpu_device_switch_gang(struct amdgpu_device *adev,

					    struct dma_fence *gang);

bool amdgpu_device_has_display_hardware(struct amdgpu_device *adev);



/* atpx handler */

#if defined(CONFIG_VGA_SWITCHEROO)

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

+1 −3
Original line number Diff line number Diff line
@@ -171,9 +171,7 @@ int amdgpu_amdkfd_reserve_mem_limit(struct amdgpu_device *adev, 
	    (kfd_mem_limit.ttm_mem_used + ttm_mem_needed >

	     kfd_mem_limit.max_ttm_mem_limit) ||

	    (adev && adev->kfd.vram_used + vram_needed >

	     adev->gmc.real_vram_size -

	     atomic64_read(&adev->vram_pin_size) -

	     reserved_for_pt)) {

	     adev->gmc.real_vram_size - reserved_for_pt)) {

		ret = -ENOMEM;

		goto release;

	}

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

+4 −2
Original line number Diff line number Diff line
@@ -288,8 +288,10 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p, 
		}

	}



	if (!p->gang_size)

		return -EINVAL;

	if (!p->gang_size) {

		ret = -EINVAL;

		goto free_partial_kdata;

	}



	for (i = 0; i < p->gang_size; ++i) {

		ret = amdgpu_job_alloc(p->adev, num_ibs[i], &p->jobs[i], vm);

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

+41 −0
Original line number Diff line number Diff line
@@ -6044,3 +6044,44 @@ struct dma_fence *amdgpu_device_switch_gang(struct amdgpu_device *adev, 
	dma_fence_put(old);

	return NULL;

}



bool amdgpu_device_has_display_hardware(struct amdgpu_device *adev)

{

	switch (adev->asic_type) {

#ifdef CONFIG_DRM_AMDGPU_SI

	case CHIP_HAINAN:

#endif

	case CHIP_TOPAZ:

		/* chips with no display hardware */

		return false;

#ifdef CONFIG_DRM_AMDGPU_SI

	case CHIP_TAHITI:

	case CHIP_PITCAIRN:

	case CHIP_VERDE:

	case CHIP_OLAND:

#endif

#ifdef CONFIG_DRM_AMDGPU_CIK

	case CHIP_BONAIRE:

	case CHIP_HAWAII:

	case CHIP_KAVERI:

	case CHIP_KABINI:

	case CHIP_MULLINS:

#endif

	case CHIP_TONGA:

	case CHIP_FIJI:

	case CHIP_POLARIS10:

	case CHIP_POLARIS11:

	case CHIP_POLARIS12:

	case CHIP_VEGAM:

	case CHIP_CARRIZO:

	case CHIP_STONEY:

		/* chips with display hardware */

		return true;

	default:

		/* IP discovery */

		if (!adev->ip_versions[DCE_HWIP][0] ||

		    (adev->harvest_ip_mask & AMD_HARVEST_IP_DMU_MASK))

			return false;

		return true;

	}

}

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

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev) 
	}



	if (amdgpu_sriov_vf(adev) ||

	    !amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_DCE)) {

	    !amdgpu_device_has_display_hardware(adev)) {

		size = 0;

	} else {

		size = amdgpu_gmc_get_vbios_fb_size(adev);