Commit 38d88d5e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.5-2023-07-12' of... 

Merge tag 'amd-drm-fixes-6.5-2023-07-12' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.5-2023-07-12:

amdgpu:
- SMU i2c locking fix
- Fix a possible deadlock in process restoration for ROCm apps
- Disable PCIe lane/speed switching on Intel platforms (the platforms don't support it)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230712184009.7740-1-alexander.deucher@amd.com
parents 864e029f e701156c

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

+1 −0
Original line number Diff line number Diff line
@@ -1296,6 +1296,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);

int amdgpu_device_pci_reset(struct amdgpu_device *adev);

bool amdgpu_device_need_post(struct amdgpu_device *adev);

bool amdgpu_device_pcie_dynamic_switching_supported(void);

bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev);

bool amdgpu_device_aspm_support_quirk(void);

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

+3 −0
Original line number Diff line number Diff line
@@ -2881,6 +2881,9 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef) 
			if (!attachment->is_mapped)

				continue;



			if (attachment->bo_va->base.bo->tbo.pin_count)

				continue;



			kfd_mem_dmaunmap_attachment(mem, attachment);

			ret = update_gpuvm_pte(mem, attachment, &sync_obj);

			if (ret) {

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

+19 −0
Original line number Diff line number Diff line
@@ -1458,6 +1458,25 @@ bool amdgpu_device_need_post(struct amdgpu_device *adev) 
	return true;

}



/*

 * Intel hosts such as Raptor Lake and Sapphire Rapids don't support dynamic

 * speed switching. Until we have confirmation from Intel that a specific host

 * supports it, it's safer that we keep it disabled for all.

 *

 * https://edc.intel.com/content/www/us/en/design/products/platforms/details/raptor-lake-s/13th-generation-core-processors-datasheet-volume-1-of-2/005/pci-express-support/

 * https://gitlab.freedesktop.org/drm/amd/-/issues/2663

 */

bool amdgpu_device_pcie_dynamic_switching_supported(void)

{

#if IS_ENABLED(CONFIG_X86)

	struct cpuinfo_x86 *c = &cpu_data(0);



	if (c->x86_vendor == X86_VENDOR_INTEL)

		return false;

#endif

	return true;

}



/**

 * amdgpu_device_should_use_aspm - check if the device should program ASPM

 *

drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h

+4 −0
Original line number Diff line number Diff line
@@ -295,5 +295,9 @@ int smu_v13_0_get_pptable_from_firmware(struct smu_context *smu, 
					uint32_t *size,

					uint32_t pptable_id);



int smu_v13_0_update_pcie_parameters(struct smu_context *smu,

				     uint32_t pcie_gen_cap,

				     uint32_t pcie_width_cap);



#endif

#endif

drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c

+1 −1
Original line number Diff line number Diff line
@@ -2113,7 +2113,6 @@ static int arcturus_i2c_xfer(struct i2c_adapter *i2c_adap, 
	}

	mutex_lock(&adev->pm.mutex);

	r = smu_cmn_update_table(smu, SMU_TABLE_I2C_COMMANDS, 0, req, true);

	mutex_unlock(&adev->pm.mutex);

	if (r)

		goto fail;
@@ -2130,6 +2129,7 @@ static int arcturus_i2c_xfer(struct i2c_adapter *i2c_adap, 
	}

	r = num_msgs;

fail:

	mutex_unlock(&adev->pm.mutex);

	kfree(req);

	return r;

}