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

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

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

 into drm-fixes

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

amdgpu:
- mGPU fan boost fix for beige goby
- S0ix fixes
- Cyan skillfish hang fix
- DCN fixes for DCN 3.1
- DCN fixes for DCN 3.01
- Apple retina panel fix
- ttm logic inversion fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220203035224.5801-1-alexander.deucher@amd.com
parents 26291c54 e8ae3872

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

+8 −2
Original line number Diff line number Diff line
@@ -1408,12 +1408,10 @@ 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_is_s0ix_active(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_is_s0ix_active(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,
@@ -1422,6 +1420,14 @@ static inline int amdgpu_acpi_smart_shift_update(struct drm_device *dev, 
						 enum amdgpu_ss ss_state) { return 0; }

#endif



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

bool amdgpu_acpi_is_s3_active(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_is_s3_active(struct amdgpu_device *adev) { return false; }

#endif



int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,

			   uint64_t addr, struct amdgpu_bo **bo,

			   struct amdgpu_bo_va_mapping **mapping);

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

+32 −5
Original line number Diff line number Diff line
@@ -1031,6 +1031,20 @@ void amdgpu_acpi_detect(void) 
	}

}



#if IS_ENABLED(CONFIG_SUSPEND)

/**

 * amdgpu_acpi_is_s3_active

 *

 * @adev: amdgpu_device_pointer

 *

 * returns true if supported, false if not.

 */

bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev)

{

	return !(adev->flags & AMD_IS_APU) ||

		(pm_suspend_target_state == PM_SUSPEND_MEM);

}



/**

 * amdgpu_acpi_is_s0ix_active

 *
@@ -1040,11 +1054,24 @@ void amdgpu_acpi_detect(void) 
 */

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev)

{

#if IS_ENABLED(CONFIG_AMD_PMC) && IS_ENABLED(CONFIG_SUSPEND)

	if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) {

		if (adev->flags & AMD_IS_APU)

			return pm_suspend_target_state == PM_SUSPEND_TO_IDLE;

	if (!(adev->flags & AMD_IS_APU) ||

	    (pm_suspend_target_state != PM_SUSPEND_TO_IDLE))

		return false;



	if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0)) {

		dev_warn_once(adev->dev,

			      "Power consumption will be higher as BIOS has not been configured for suspend-to-idle.\n"

			      "To use suspend-to-idle change the sleep mode in BIOS setup.\n");

		return false;

	}

#endif



#if !IS_ENABLED(CONFIG_AMD_PMC)

	dev_warn_once(adev->dev,

		      "Power consumption will be higher as the kernel has not been compiled with CONFIG_AMD_PMC.\n");

	return false;

#else

	return true;

#endif /* CONFIG_AMD_PMC */

}



#endif /* CONFIG_SUSPEND */

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

+9 −2
Original line number Diff line number Diff line
@@ -2246,13 +2246,20 @@ static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work) 
static int amdgpu_pmops_prepare(struct device *dev)

{

	struct drm_device *drm_dev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(drm_dev);



	/* Return a positive number here so

	 * DPM_FLAG_SMART_SUSPEND works properly

	 */

	if (amdgpu_device_supports_boco(drm_dev))

		return pm_runtime_suspended(dev) &&

			pm_suspend_via_firmware();

		return pm_runtime_suspended(dev);



	/* if we will not support s3 or s2i for the device

	 *  then skip suspend

	 */

	if (!amdgpu_acpi_is_s0ix_active(adev) &&

	    !amdgpu_acpi_is_s3_active(adev))

		return 1;



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1904,7 +1904,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, 
	unsigned i;

	int r;



	if (direct_submit && !ring->sched.ready) {

	if (!direct_submit && !ring->sched.ready) {

		DRM_ERROR("Trying to move memory with ring turned off.\n");

		return -EINVAL;

	}

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

+3 −0
Original line number Diff line number Diff line
@@ -1140,6 +1140,9 @@ static void gmc_v10_0_get_clockgating_state(void *handle, u32 *flags) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 1, 3))

		return;



	adev->mmhub.funcs->get_clockgating(adev, flags);



	if (adev->ip_versions[ATHUB_HWIP][0] >= IP_VERSION(2, 1, 0))