Patch "drm/amdgpu: Fix invalid number of character '{' in amdgpu_acpi_init" has been added to the 5.9-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/amdgpu: Fix invalid number of character '{' in amdgpu_acpi_init

to the 5.9-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-invalid-number-of-character-in-amdgpu.patch
and it can be found in the queue-5.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 3e269b66376083e76b2ed108fc9eb5ba57ce7609
Author: Ye Bin <yebin10@xxxxxxxxxx>
Date:   Fri Oct 9 15:42:18 2020 +0800

    drm/amdgpu: Fix invalid number of character '{' in amdgpu_acpi_init
    
    [ Upstream commit 9c27bc97aff8bbe62b5b29ebf528291dd85d9c86 ]
    
    Fix follow warning:
    Checking drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c...
    [drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c:770]: (error) Invalid number
    of character '{' when these macros are defined: ''.
    Checking drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c: CONFIG_ACPI...
    [drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c:770]: (error) Invalid number
    of character '{' when these macros are defined: 'CONFIG_ACPI'.
    ......
    Checking drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c: CONFIG_X86...
    [drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c:770]: (error) Invalid number
    of character '{' when these macros are defined: 'CONFIG_X86'.
    Checking drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c: _X86_...
    [drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c:770]: (error) Invalid number
    of character '{' when these macros are defined: '_X86_'.
    Checking drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c: __linux__...
    [drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c:770]: (error) Invalid number
    of character '{' when these macros are defined: '__linux__'.
    
    Fixes: 97d798b276e9 ("drm/amdgpu: simplify ATIF backlight handling")
    Reported-by: Hulk Robot <hulkci@xxxxxxxxxx>
    Signed-off-by: Ye Bin <yebin10@xxxxxxxxxx>
    Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
index 913c8f0513bd3..5b7dc1d1b44c7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
@@ -806,8 +806,8 @@ int amdgpu_acpi_init(struct amdgpu_device *adev)
 	}
 	adev->atif = atif;
 
-	if (atif->notifications.brightness_change) {
 #if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
+	if (atif->notifications.brightness_change) {
 		if (amdgpu_device_has_dc_support(adev)) {
 #if defined(CONFIG_DRM_AMD_DC)
 			struct amdgpu_display_manager *dm = &adev->dm;