Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Martin Leung <martin.leung@amd.com>
Acked-by: Roman Li <roman.li@amd.com>
Signed-off-by: Mounika Adhuri <moadhuri@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Mounika Adhuri and committed by
Alex Deucher
fec85f99 f5a3507c

+4 -4
+2 -2
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
··· 249 249 return false; 250 250 } 251 251 252 - static void build_prescale_params(struct ipp_prescale_params *prescale_params, 252 + static void dce110_prescale_params(struct ipp_prescale_params *prescale_params, 253 253 const struct dc_plane_state *plane_state) 254 254 { 255 255 prescale_params->mode = IPP_PRESCALE_MODE_FIXED_UNSIGNED; ··· 291 291 292 292 tf = &plane_state->in_transfer_func; 293 293 294 - build_prescale_params(&prescale_params, plane_state); 294 + dce110_prescale_params(&prescale_params, plane_state); 295 295 ipp->funcs->ipp_program_prescale(ipp, &prescale_params); 296 296 297 297 if (!plane_state->gamma_correction.is_identity &&
+2 -2
drivers/gpu/drm/amd/display/include/grph_object_id.h
··· 226 226 227 227 struct graphics_object_id { 228 228 uint32_t id:8; 229 - uint32_t enum_id:4; 230 - uint32_t type:4; 229 + enum object_enum_id enum_id; 230 + enum object_type type; 231 231 uint32_t reserved:16; /* for padding. total size should be u32 */ 232 232 }; 233 233