Skip to contentSkip to conversation

drm/amd/display: Guard ACPI calls with CONFIG_ACPI

PATCH Superseded [email protected] 2 participants 3 messages Jun 10, 2024

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

PATCH 1/1 drm/amd/display: Guard ACPI calls with CONFIG_ACPI

From: Leo Li <[email protected]>

To fix CONFIG_ACPI disabled build error.

Fixes ec6f30c776ad ("drm/amd/display: Set default brightness according to ACPI")
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6 -0
index a2c098f1b07c..6b3634db4c15 100644
@@ -4572,7 +4572,9 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector)
 	struct drm_device *drm = aconnector->base.dev;
 	struct amdgpu_display_manager *dm = &drm_to_adev(drm)->dm;
 	struct backlight_properties props = { 0 };
+#if defined(CONFIG_ACPI)
 	struct amdgpu_dm_backlight_caps caps = { 0 };
+#endif
 	char bl_name[16];
 
 	if (aconnector->bl_idx == -1)
@@ -4585,6 +4587,7 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector)
 		return;
 	}
 
+#if defined(CONFIG_ACPI)
 	amdgpu_acpi_get_backlight_caps(&caps);
 	if (caps.caps_valid) {
 		if (power_supply_is_system_supplied() > 0)
@@ -4593,6 +4596,9 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector)
 			props.brightness = caps.dc_level;
 	} else
 		props.brightness = AMDGPU_MAX_BL_LEVEL;
+#else
+	props.brightness = AMDGPU_MAX_BL_LEVEL;
+#endif
 
 	props.max_brightness = AMDGPU_MAX_BL_LEVEL;
 	props.type = BACKLIGHT_RAW;
Signature · 1 line
2.45.1
#1 lore raw
Quoted 33 lines · On 6/10/2024 09:55, [email protected] wrote:

From: Leo Li <[email protected]>

To fix CONFIG_ACPI disabled build error.

Fixes ec6f30c776ad ("drm/amd/display: Set default brightness according to ACPI")
---
  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++++
  1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
index a2c098f1b07c..6b3634db4c15 100644
@@ -4572,7 +4572,9 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector)
  	struct drm_device *drm = aconnector->base.dev;
  	struct amdgpu_display_manager *dm = &drm_to_adev(drm)->dm;
  	struct backlight_properties props = { 0 };
+#if defined(CONFIG_ACPI)
  	struct amdgpu_dm_backlight_caps caps = { 0 };
+#endif
  	char bl_name[16];
 
  	if (aconnector->bl_idx == -1)
@@ -4585,6 +4587,7 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector)
  		return;
  	}
 
+#if defined(CONFIG_ACPI)
  	amdgpu_acpi_get_backlight_caps(&caps);
  	if (caps.caps_valid) {
  		if (power_supply_is_system_supplied() > 0)

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector) · line 4601

Quoted 6 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -4593,6 +4596,9 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector)
  			props.brightness = caps.dc_level;
  	} else
  		props.brightness = AMDGPU_MAX_BL_LEVEL;
+#else
+	props.brightness = AMDGPU_MAX_BL_LEVEL;
+#endif

Hey Leo,

Thanks for the patch!

As caps is initialized to {0} caps.caps_valid will be invalid. So I see two other ways to solve this that are a little cleaner (IMO):

1) Just block the one call:

#if defined(CONFIG_ACPI)
	amdgpu_acpi_get_backlight_caps(&caps);

#endif

2) Add a stub inline no-op function for amdgpu_acpi_get_backlight_caps() to the header.

I personally think #2 is cleaner (less ifdef makes a lot more readable code).

Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -0
  	props.max_brightness = AMDGPU_MAX_BL_LEVEL;
  	props.type = BACKLIGHT_RAW;
author maintainer
#2 lore raw
Quoted 50 lines · Mario Limonciello
Quoted 33 lines · On 6/10/2024 09:55, [email protected] wrote:

From: Leo Li <[email protected]>

To fix CONFIG_ACPI disabled build error.

Fixes ec6f30c776ad ("drm/amd/display: Set default brightness according to ACPI")

---
  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++++

  1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
index a2c098f1b07c..6b3634db4c15 100644
@@ -4572,7 +4572,9 @@ amdgpu_dm_register_backlight_device(struct 
 amdgpu_dm_connector *aconnector)
       struct drm_device *drm = aconnector->base.dev;
       struct amdgpu_display_manager *dm = &drm_to_adev(drm)->dm;
       struct backlight_properties props = { 0 };
+#if defined(CONFIG_ACPI)
       struct amdgpu_dm_backlight_caps caps = { 0 };
+#endif
       char bl_name[16];
       if (aconnector->bl_idx == -1)
@@ -4585,6 +4587,7 @@ amdgpu_dm_register_backlight_device(struct 
 amdgpu_dm_connector *aconnector)
           return;
       }
+#if defined(CONFIG_ACPI)
       amdgpu_acpi_get_backlight_caps(&caps);
       if (caps.caps_valid) {
           if (power_supply_is_system_supplied() > 0)

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c amdgpu_dm_register_backlight_device(struct · line 4602

Quoted 7 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -4593,6 +4596,9 @@ amdgpu_dm_register_backlight_device(struct 
 amdgpu_dm_connector *aconnector)
               props.brightness = caps.dc_level;
       } else
           props.brightness = AMDGPU_MAX_BL_LEVEL;
+#else
+    props.brightness = AMDGPU_MAX_BL_LEVEL;
+#endif

Hey Leo,

Thanks for the patch!

As caps is initialized to {0} caps.caps_valid will be invalid.  So I see two other ways to solve this that are a little cleaner (IMO):

1)  Just block the one call:

Quoted 7 lines

#if defined(CONFIG_ACPI)
    amdgpu_acpi_get_backlight_caps(&caps);
#endif

2) Add a stub inline no-op function for amdgpu_acpi_get_backlight_caps() to the header.

I personally think #2 is cleaner (less ifdef makes a lot more readable code).

Agreed, we're using #2 for other ACPI stuff, actually. Sending v2 soon.

- Leo

Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -0
       props.max_brightness = AMDGPU_MAX_BL_LEVEL;
       props.type = BACKLIGHT_RAW;