drm/amd/display: fix duplicate assignments
Subsystems (3)
PATCH 1/1 drm/amd/display: fix duplicate assignments
From: Arnd Bergmann <[email protected]>
The .set_odm_combine callback pointer was added twice, causing a harmless -Wextra warning:
drivers/gpu/drm/amd/amdgpu/../display/dc/dcn314/dcn314_optc.c:258:36: error: initialized field overwritten [-Werror=override-init]
258 | .set_odm_combine = optc314_set_odm_combine,
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/dc/dcn314/dcn314_optc.c:258:36: note: (near initialization for 'dcn314_tg_funcs.set_odm_combine')
--- drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c +0 -1
@@ -241,7 +241,6 @@ static struct timing_generator_funcs dcn314_tg_funcs = { .set_dsc_config = optc3_set_dsc_config, .get_dsc_status = optc2_get_dsc_status, .set_dwb_source = NULL, - .set_odm_combine = optc314_set_odm_combine, .get_optc_source = optc2_get_optc_source, .set_out_mux = optc3_set_out_mux, .set_drr_trigger_window = optc3_set_drr_trigger_window,
Signature · 1 line
2.35.1
Alex Deucher
AppliedApplied. Thanks!
Alex
Quoted 32 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The .set_odm_combine callback pointer was added twice, causing a harmless -Wextra warning:
drivers/gpu/drm/amd/amdgpu/../display/dc/dcn314/dcn314_optc.c:258:36: error: initialized field overwritten [-Werror=override-init]
258 | .set_odm_combine =optc314_set_odm_combine,| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/dc/dcn314/dcn314_optc.c:258:36: note: (near initialization for 'dcn314_tg_funcs.set_odm_combine')Fixes 5ade1b951dec ("drm/amd/display: Add OTG/ODM functions")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 1 - 1 file changed, 1 deletion(-)drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c +0
-2@@ -241,7 +241,6 @@ static struct timing_generator_funcs dcn314_tg_funcs = { .set_dsc_config = optc3_set_dsc_config, .get_dsc_status = optc2_get_dsc_status, .set_dwb_source = NULL, - .set_odm_combine = optc314_set_odm_combine, .get_optc_source = optc2_get_optc_source, .set_out_mux = optc3_set_out_mux, .set_drr_trigger_window = optc3_set_drr_trigger_window, --2.35.1