Commit fec85f99 authored by Mounika Adhuri's avatar Mounika Adhuri Committed by Alex Deucher

drm/amd/display: Fix compiler redefinition warnings for certain configs

[why & how]
Modified definitions of 1 function and 2 structs to remove warnings on
certain specific compiler configurations due to redefinition.
Reviewed-by: default avatarMartin Leung <martin.leung@amd.com>
Acked-by: default avatarRoman Li <roman.li@amd.com>
Signed-off-by: default avatarMounika Adhuri <moadhuri@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f5a3507c
......@@ -249,7 +249,7 @@ static bool dce110_enable_display_power_gating(
return false;
}
static void build_prescale_params(struct ipp_prescale_params *prescale_params,
static void dce110_prescale_params(struct ipp_prescale_params *prescale_params,
const struct dc_plane_state *plane_state)
{
prescale_params->mode = IPP_PRESCALE_MODE_FIXED_UNSIGNED;
......@@ -291,7 +291,7 @@ dce110_set_input_transfer_func(struct dc *dc, struct pipe_ctx *pipe_ctx,
tf = &plane_state->in_transfer_func;
build_prescale_params(&prescale_params, plane_state);
dce110_prescale_params(&prescale_params, plane_state);
ipp->funcs->ipp_program_prescale(ipp, &prescale_params);
if (!plane_state->gamma_correction.is_identity &&
......
......@@ -226,8 +226,8 @@ enum dp_alt_mode {
struct graphics_object_id {
uint32_t id:8;
uint32_t enum_id:4;
uint32_t type:4;
enum object_enum_id enum_id;
enum object_type type;
uint32_t reserved:16; /* for padding. total size should be u32 */
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment