Commit 7c17b3d3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.17-2022-02-23' of... 

Merge tag 'amd-drm-fixes-5.17-2022-02-23' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.17-2022-02-23:

amdgpu:
- Display FP fix
- PCO powergating fix
- RDNA2 OEM SKU stability fixes
- Display PSR fix
- PCI ASPM fix
- Display link encoder fix for TEST_COMMIT
- Raven2 suspend/resume fix
- Fix a regression in virtual display support
- GPUVM eviction fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220223214623.28823-1-alexander.deucher@amd.com
parents 0c312793 c1a66c3b

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

+1 −1
Original line number Diff line number Diff line
@@ -1141,7 +1141,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, 
	if (ret)

		return ret;



	if (!dev->mode_config.allow_fb_modifiers) {

	if (!dev->mode_config.allow_fb_modifiers && !adev->enable_virtual_display) {

		drm_WARN_ONCE(dev, adev->family >= AMDGPU_FAMILY_AI,

			      "GFX9+ requires FB check based on format modifier\n");

		ret = check_tiling_flags_gfx6(rfb);

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

+3 −0
Original line number Diff line number Diff line
@@ -2011,6 +2011,9 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, 
			return -ENODEV;

	}



	if (amdgpu_aspm == -1 && !pcie_aspm_enabled(pdev))

		amdgpu_aspm = 0;



	if (amdgpu_virtual_display ||

	    amdgpu_device_asic_has_dc_support(flags & AMD_ASIC_MASK))

		supports_atomic = true;

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

+1 −2
Original line number Diff line number Diff line
@@ -391,7 +391,6 @@ static struct drm_plane *amdgpu_vkms_plane_init(struct drm_device *dev, 
						int index)

{

	struct drm_plane *plane;

	uint64_t modifiers[] = {DRM_FORMAT_MOD_LINEAR, DRM_FORMAT_MOD_INVALID};

	int ret;



	plane = kzalloc(sizeof(*plane), GFP_KERNEL);
@@ -402,7 +401,7 @@ static struct drm_plane *amdgpu_vkms_plane_init(struct drm_device *dev, 
				       &amdgpu_vkms_plane_funcs,

				       amdgpu_vkms_formats,

				       ARRAY_SIZE(amdgpu_vkms_formats),

				       modifiers, type, NULL);

				       NULL, type, NULL);

	if (ret) {

		kfree(plane);

		return ERR_PTR(ret);

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

+7 −2
Original line number Diff line number Diff line
@@ -768,11 +768,16 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
 * Check if all VM PDs/PTs are ready for updates

 *

 * Returns:

 * True if eviction list is empty.

 * True if VM is not evicting.

 */

bool amdgpu_vm_ready(struct amdgpu_vm *vm)

{

	return list_empty(&vm->evicted);

	bool ret;



	amdgpu_vm_eviction_lock(vm);

	ret = !vm->evicting;

	amdgpu_vm_eviction_unlock(vm);

	return ret;

}



/**

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

+6 −3
Original line number Diff line number Diff line
@@ -619,8 +619,8 @@ soc15_asic_reset_method(struct amdgpu_device *adev) 
static int soc15_asic_reset(struct amdgpu_device *adev)

{

	/* original raven doesn't have full asic reset */

	if ((adev->apu_flags & AMD_APU_IS_RAVEN) &&

	    !(adev->apu_flags & AMD_APU_IS_RAVEN2))

	if ((adev->apu_flags & AMD_APU_IS_RAVEN) ||

	    (adev->apu_flags & AMD_APU_IS_RAVEN2))

		return 0;



	switch (soc15_asic_reset_method(adev)) {
@@ -1114,8 +1114,11 @@ static int soc15_common_early_init(void *handle) 
				AMD_CG_SUPPORT_SDMA_LS |

				AMD_CG_SUPPORT_VCN_MGCG;



			/*

			 * MMHUB PG needs to be disabled for Picasso for

			 * stability reasons.

			 */

			adev->pg_flags = AMD_PG_SUPPORT_SDMA |

				AMD_PG_SUPPORT_MMHUB |

				AMD_PG_SUPPORT_VCN;

		} else {

			adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG |