diff options
| author | Ray Wu <ray.wu@amd.com> | 2026-04-20 10:16:12 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2026-05-05 16:56:52 +0300 |
| commit | 35a8ecb704938596fd655c25dca4234ee5cc031f (patch) | |
| tree | 64067e05dff715c704e15b72f912ab71d9c3be1f | |
| parent | a62e6f515e00ef3ef33c57d06fbf803dbe4c3f08 (diff) | |
| download | linux-35a8ecb704938596fd655c25dca4234ee5cc031f.tar.xz | |
drm/amd/display: Rename backlight_properties to pwr_backlight_properties
[Why]
'struct backlight_properties' in power.c has the same name as the kernel's
struct defined in <linux/backlight.h>. In out-of-tree backport build
environments, the header is forcefully injected via command-line includes,
causing a redefinition error.
[How]
Rename the file-local 'struct backlight_properties' to
'pwr_backlight_properties' to avoid the name collision. No functional
change.
Reviewed-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Ray Wu <ray.wu@amd.com>
Signed-off-by: James Lin <pinglei.lin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/display/modules/power/power.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/modules/power/power.c b/drivers/gpu/drm/amd/display/modules/power/power.c index 81d15a51e045..5cef60079d67 100644 --- a/drivers/gpu/drm/amd/display/modules/power/power.c +++ b/drivers/gpu/drm/amd/display/modules/power/power.c @@ -70,7 +70,7 @@ struct power_entity { unsigned int replay_events; }; -struct backlight_properties { +struct pwr_backlight_properties { bool use_nits_based_brightness; bool disable_fractional_pwm; @@ -118,7 +118,7 @@ struct core_power { struct dc *dc; struct power_entity *map; struct dmcu_varibright_cached_properties varibright_prop; - struct backlight_properties bl_prop[MAX_NUM_EDP]; + struct pwr_backlight_properties bl_prop[MAX_NUM_EDP]; struct backlight_state bl_state[MAX_NUM_EDP]; unsigned int edp_num; @@ -1103,7 +1103,7 @@ static void fill_backlight_level_params(struct core_power *core_power, unsigned int backlight_millinit, unsigned int transition_time_millisec, bool is_hdr) { - struct backlight_properties *bl_prop = &core_power->bl_prop[panel_inst]; + struct pwr_backlight_properties *bl_prop = &core_power->bl_prop[panel_inst]; backlight_level_params->aux_inst = aux_inst; backlight_level_params->backlight_pwm_u16_16 = backlight_pwm; |