mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 17:47:41 +02:00
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>
This commit is contained in:
parent
a62e6f515e
commit
35a8ecb704
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user