Commit 2e4e9de1 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'amd-drm-fixes-6.3-2023-03-23' of... 

Merge tag 'amd-drm-fixes-6.3-2023-03-23' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.3-2023-03-23:

amdgpu:
- S4 fix
- Soft reset fixes
- SR-IOV fix
- Remove an out of date comment in the DC code
- ASPM fix
- DCN 3.2 fixes

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230323161939.7751-1-alexander.deucher@amd.com
parents e37fef79 f9537b1f

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

+3 −2
Original line number Diff line number Diff line
@@ -1272,6 +1272,7 @@ 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_should_use_aspm(struct amdgpu_device *adev);

bool amdgpu_device_aspm_support_quirk(void);



void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes,

				  u64 num_vis_bytes);
@@ -1391,10 +1392,12 @@ int amdgpu_acpi_smart_shift_update(struct drm_device *dev, enum amdgpu_ss ss_sta 
int amdgpu_acpi_pcie_notify_device_ready(struct amdgpu_device *adev);



void amdgpu_acpi_get_backlight_caps(struct amdgpu_dm_backlight_caps *caps);

bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev);

void amdgpu_acpi_detect(void);

#else

static inline int amdgpu_acpi_init(struct amdgpu_device *adev) { return 0; }

static inline void amdgpu_acpi_fini(struct amdgpu_device *adev) { }

static inline bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev) { return false; }

static inline void amdgpu_acpi_detect(void) { }

static inline bool amdgpu_acpi_is_power_shift_control_supported(void) { return false; }

static inline int amdgpu_acpi_power_shift_control(struct amdgpu_device *adev,
@@ -1405,11 +1408,9 @@ static inline int amdgpu_acpi_smart_shift_update(struct drm_device *dev, 


#if defined(CONFIG_ACPI) && defined(CONFIG_SUSPEND)

bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);

bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev);

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);

#else

static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }

static inline bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev) { return false; }

static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }

#endif

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

+23 −18
Original line number Diff line number Diff line
@@ -971,6 +971,29 @@ static bool amdgpu_atcs_pci_probe_handle(struct pci_dev *pdev) 
	return true;

}





/**

 * amdgpu_acpi_should_gpu_reset

 *

 * @adev: amdgpu_device_pointer

 *

 * returns true if should reset GPU, false if not

 */

bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev)

{

	if (adev->flags & AMD_IS_APU)

		return false;



	if (amdgpu_sriov_vf(adev))

		return false;



#if IS_ENABLED(CONFIG_SUSPEND)

	return pm_suspend_target_state != PM_SUSPEND_TO_IDLE;

#else

	return true;

#endif

}



/*

 * amdgpu_acpi_detect - detect ACPI ATIF/ATCS methods

 *
@@ -1042,24 +1065,6 @@ bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) 
		(pm_suspend_target_state == PM_SUSPEND_MEM);

}



/**

 * amdgpu_acpi_should_gpu_reset

 *

 * @adev: amdgpu_device_pointer

 *

 * returns true if should reset GPU, false if not

 */

bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev)

{

	if (adev->flags & AMD_IS_APU)

		return false;



	if (amdgpu_sriov_vf(adev))

		return false;



	return pm_suspend_target_state != PM_SUSPEND_TO_IDLE;

}



/**

 * amdgpu_acpi_is_s0ix_active

 *

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

+15 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ 


#include <drm/drm_drv.h>



#if IS_ENABLED(CONFIG_X86)

#include <asm/intel-family.h>

#endif



MODULE_FIRMWARE("amdgpu/vega10_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/vega12_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin");
@@ -1356,6 +1360,17 @@ bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev) 
	return pcie_aspm_enabled(adev->pdev);

}



bool amdgpu_device_aspm_support_quirk(void)

{

#if IS_ENABLED(CONFIG_X86)

	struct cpuinfo_x86 *c = &cpu_data(0);



	return !(c->x86 == 6 && c->x86_model == INTEL_FAM6_ALDERLAKE);

#else

	return true;

#endif

}



/* if we get transitioned to only one device, take VGA back */

/**

 * amdgpu_device_vga_set_decode - enable/disable vga decode

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

+4 −1
Original line number Diff line number Diff line
@@ -2467,7 +2467,10 @@ static int amdgpu_pmops_freeze(struct device *dev) 
	adev->in_s4 = false;

	if (r)

		return r;



	if (amdgpu_acpi_should_gpu_reset(adev))

		return amdgpu_asic_reset(adev);

	return 0;

}



static int amdgpu_pmops_thaw(struct device *dev)

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

+9 −0
Original line number Diff line number Diff line
@@ -678,6 +678,15 @@ void amdgpu_fence_driver_clear_job_fences(struct amdgpu_ring *ring) 
		ptr = &ring->fence_drv.fences[i];

		old = rcu_dereference_protected(*ptr, 1);

		if (old && old->ops == &amdgpu_job_fence_ops) {

			struct amdgpu_job *job;



			/* For non-scheduler bad job, i.e. failed ib test, we need to signal

			 * it right here or we won't be able to track them in fence_drv

			 * and they will remain unsignaled during sa_bo free.

			 */

			job = container_of(old, struct amdgpu_job, hw_fence);

			if (!job->base.s_fence && !dma_fence_is_signaled(old))

				dma_fence_signal(old);

			RCU_INIT_POINTER(*ptr, NULL);

			dma_fence_put(old);

		}