Commit 15504993 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Alex Deucher

drm/amd/display: fix duplicate assignments

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: 5ade1b95 ("drm/amd/display: Add OTG/ODM functions")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 41d82649
...@@ -241,7 +241,6 @@ static struct timing_generator_funcs dcn314_tg_funcs = { ...@@ -241,7 +241,6 @@ static struct timing_generator_funcs dcn314_tg_funcs = {
.set_dsc_config = optc3_set_dsc_config, .set_dsc_config = optc3_set_dsc_config,
.get_dsc_status = optc2_get_dsc_status, .get_dsc_status = optc2_get_dsc_status,
.set_dwb_source = NULL, .set_dwb_source = NULL,
.set_odm_combine = optc314_set_odm_combine,
.get_optc_source = optc2_get_optc_source, .get_optc_source = optc2_get_optc_source,
.set_out_mux = optc3_set_out_mux, .set_out_mux = optc3_set_out_mux,
.set_drr_trigger_window = optc3_set_drr_trigger_window, .set_drr_trigger_window = optc3_set_drr_trigger_window,
......
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