Skip to content

Commit 64f9915

Browse files
Rodrigo Siqueiraalexdeucher
authored andcommitted
drm/amd/display: Fix a compilation failure on PowerPC caused by FPU code
We got a report from Stephen/Michael that the PowerPC build was failing with the following error: ld: drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.o uses hard float, drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o uses soft float ld: failed to merge target specific data of file drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o This error happened because of the function optc3_set_vrr_m_const. This function expects a double as a parameter in a code that is not allowed to have FPU operations. After further investigation, it became clear that optc3_set_vrr_m_const was never invoked, so we can safely drop this function and fix the ld issue. Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Melissa Wen <mwen@igalia.com> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Reported-by: Michael Ellerman <mpe@ellerman.id.au> Tested-by: Michael Ellerman <mpe@ellerman.id.au> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 7e8a3ca commit 64f9915

4 files changed

Lines changed: 0 additions & 14 deletions

File tree

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,6 @@ void optc3_set_dsc_config(struct timing_generator *optc,
184184
REG_UPDATE(OTG_V_SYNC_A_CNTL, OTG_V_SYNC_MODE, 0);
185185
}
186186

187-
void optc3_set_vrr_m_const(struct timing_generator *optc,
188-
double vtotal_avg)
189-
{
190-
DC_FP_START();
191-
optc3_fpu_set_vrr_m_const(optc, vtotal_avg);
192-
DC_FP_END();
193-
}
194-
195187
void optc3_set_odm_bypass(struct timing_generator *optc,
196188
const struct dc_crtc_timing *dc_crtc_timing)
197189
{

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,6 @@ void optc3_lock_doublebuffer_enable(struct timing_generator *optc);
329329

330330
void optc3_lock_doublebuffer_disable(struct timing_generator *optc);
331331

332-
void optc3_set_vrr_m_const(struct timing_generator *optc,
333-
double vtotal_avg);
334-
335332
void optc3_set_drr_trigger_window(struct timing_generator *optc,
336333
uint32_t window_start, uint32_t window_end);
337334

drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ static struct timing_generator_funcs dcn32_tg_funcs = {
281281
.lock_doublebuffer_enable = optc3_lock_doublebuffer_enable,
282282
.lock_doublebuffer_disable = optc3_lock_doublebuffer_disable,
283283
.enable_optc_clock = optc1_enable_optc_clock,
284-
.set_vrr_m_const = optc3_set_vrr_m_const,
285284
.set_drr = optc31_set_drr, // TODO: Update to optc32_set_drr once FW headers are promoted
286285
.get_last_used_drr_vtotal = optc2_get_last_used_drr_vtotal,
287286
.set_vtotal_min_max = optc3_set_vtotal_min_max,

drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,6 @@ struct timing_generator_funcs {
302302
int group_idx,
303303
uint32_t gsl_ready_signal);
304304
void (*set_out_mux)(struct timing_generator *tg, enum otg_out_mux_dest dest);
305-
void (*set_vrr_m_const)(struct timing_generator *optc,
306-
double vtotal_avg);
307305
void (*set_drr_trigger_window)(struct timing_generator *optc,
308306
uint32_t window_start, uint32_t window_end);
309307
void (*set_vtotal_change_limit)(struct timing_generator *optc,

0 commit comments

Comments
 (0)