This is a note to let you know that I've just added the patch titled drm/amdgpu: fix S0ix handling when the CONFIG_AMD_PMC=m to the 5.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-amdgpu-fix-s0ix-handling-when-the-config_amd_pmc-m.patch and it can be found in the queue-5.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From a5cb3c1a36376c25cd25fd3e99918dc48ac420bb Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexander.deucher@xxxxxxx> Date: Tue, 9 Mar 2021 22:58:47 -0500 Subject: drm/amdgpu: fix S0ix handling when the CONFIG_AMD_PMC=m From: Alex Deucher <alexander.deucher@xxxxxxx> commit a5cb3c1a36376c25cd25fd3e99918dc48ac420bb upstream. Need to check the module variant as well. Acked-by: Prike Liang <Prike.Liang@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c @@ -903,7 +903,7 @@ void amdgpu_acpi_fini(struct amdgpu_devi */ bool amdgpu_acpi_is_s0ix_supported(struct amdgpu_device *adev) { -#if defined(CONFIG_AMD_PMC) +#if defined(CONFIG_AMD_PMC) || defined(CONFIG_AMD_PMC_MODULE) if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) { if (adev->flags & AMD_IS_APU) return true; Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are queue-5.11/drm-amd-display-fix-nested-fpu-context-in-dcn21_validate_bandwidth.patch queue-5.11/drm-radeon-also-init-gem-funcs-in-radeon_gem_prime_import_sg_table.patch queue-5.11/drm-amd-display-add-a-backlight-module-option.patch queue-5.11/drm-amd-pm-correct-the-watermark-settings-for-polaris.patch queue-5.11/drm-amdgpu-display-simplify-backlight-setting.patch queue-5.11/drm-amdgpu-display-use-gfp_atomic-in-dcn21_validate_bandwidth_fp.patch queue-5.11/drm-amdgpu-fix-s0ix-handling-when-the-config_amd_pmc-m.patch queue-5.11/drm-amdgpu-display-handle-aux-backlight-in-backlight_get_brightness.patch queue-5.11/drm-amdgpu-display-don-t-assert-in-set-backlight-function.patch queue-5.11/drm-amd-pm-bug-fix-for-pcie-dpm.patch