Skip to contentSkip to conversation

drm/amd/display: Fix a compilation failure on PowerPC caused by FPU code

PATCH Superseded Rodrigo Siqueira 4 participants 4 messages Jul 28, 2022 – Jul 29, 2022

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c        | 8 --------
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h        | 3 ---
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c        | 1 -
 drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h | 2 --
 4 files changed, 14 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c +0 -8
index d072997477dd..1782b9c26cf4 100644
@@ -184,14 +184,6 @@ void optc3_set_dsc_config(struct timing_generator *optc,
 	REG_UPDATE(OTG_V_SYNC_A_CNTL, OTG_V_SYNC_MODE, 0);
 }
 
-void optc3_set_vrr_m_const(struct timing_generator *optc,
-		double vtotal_avg)
-{
-	DC_FP_START();
-	optc3_fpu_set_vrr_m_const(optc, vtotal_avg);
-	DC_FP_END();
-}
-
 void optc3_set_odm_bypass(struct timing_generator *optc,
 		const struct dc_crtc_timing *dc_crtc_timing)
 {
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h +0 -3
index 33bd12f5dc17..dd45a5499b07 100644
@@ -329,9 +329,6 @@ void optc3_lock_doublebuffer_enable(struct timing_generator *optc);
 
 void optc3_lock_doublebuffer_disable(struct timing_generator *optc);
 
-void optc3_set_vrr_m_const(struct timing_generator *optc,
-		double vtotal_avg);
-
 void optc3_set_drr_trigger_window(struct timing_generator *optc,
 		uint32_t window_start, uint32_t window_end);
 
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c +0 -1
index 992e56c6907e..eff1f4e17689 100644
@@ -281,7 +281,6 @@ static struct timing_generator_funcs dcn32_tg_funcs = {
 		.lock_doublebuffer_enable = optc3_lock_doublebuffer_enable,
 		.lock_doublebuffer_disable = optc3_lock_doublebuffer_disable,
 		.enable_optc_clock = optc1_enable_optc_clock,
-		.set_vrr_m_const = optc3_set_vrr_m_const,
 		.set_drr = optc31_set_drr, // TODO: Update to optc32_set_drr once FW headers are promoted
 		.get_last_used_drr_vtotal = optc2_get_last_used_drr_vtotal,
 		.set_vtotal_min_max = optc3_set_vtotal_min_max,
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +0 -2
index 62d4683f17a2..4cfa733cf96f 100644
@@ -302,8 +302,6 @@ struct timing_generator_funcs {
 			int group_idx,
 			uint32_t gsl_ready_signal);
 	void (*set_out_mux)(struct timing_generator *tg, enum otg_out_mux_dest dest);
-	void (*set_vrr_m_const)(struct timing_generator *optc,
-			double vtotal_avg);
 	void (*set_drr_trigger_window)(struct timing_generator *optc,
 			uint32_t window_start, uint32_t window_end);
 	void (*set_vtotal_change_limit)(struct timing_generator *optc,
Signature · 1 line
2.35.1
Acked-by on v1 1/1
#1 lore raw
Quoted 13 lines · Rodrigo Siqueira

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.

Quoted 5 lines
Quoted 68 lines
---
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c        | 8 --------
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h        | 3 ---
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c        | 1 -
 drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h | 2 --
 4 files changed, 14 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c +0 -8
index d072997477dd..1782b9c26cf4 100644
@@ -184,14 +184,6 @@ void optc3_set_dsc_config(struct timing_generator *optc,
        REG_UPDATE(OTG_V_SYNC_A_CNTL, OTG_V_SYNC_MODE, 0);
 }
 
-void optc3_set_vrr_m_const(struct timing_generator *optc,
-               double vtotal_avg)
-{
-       DC_FP_START();
-       optc3_fpu_set_vrr_m_const(optc, vtotal_avg);
-       DC_FP_END();
-}
-
 void optc3_set_odm_bypass(struct timing_generator *optc,
                const struct dc_crtc_timing *dc_crtc_timing)
 {
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h +0 -3
index 33bd12f5dc17..dd45a5499b07 100644
@@ -329,9 +329,6 @@ void optc3_lock_doublebuffer_enable(struct timing_generator *optc);
 
 void optc3_lock_doublebuffer_disable(struct timing_generator *optc);
 
-void optc3_set_vrr_m_const(struct timing_generator *optc,
-               double vtotal_avg);
-
 void optc3_set_drr_trigger_window(struct timing_generator *optc,
                uint32_t window_start, uint32_t window_end);
 
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c +0 -1
index 992e56c6907e..eff1f4e17689 100644
@@ -281,7 +281,6 @@ static struct timing_generator_funcs dcn32_tg_funcs = {
                .lock_doublebuffer_enable = optc3_lock_doublebuffer_enable,
                .lock_doublebuffer_disable = optc3_lock_doublebuffer_disable,
                .enable_optc_clock = optc1_enable_optc_clock,
-               .set_vrr_m_const = optc3_set_vrr_m_const,
                .set_drr = optc31_set_drr, // TODO: Update to optc32_set_drr once FW headers are promoted
                .get_last_used_drr_vtotal = optc2_get_last_used_drr_vtotal,
                .set_vtotal_min_max = optc3_set_vtotal_min_max,
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +0 -3
index 62d4683f17a2..4cfa733cf96f 100644
@@ -302,8 +302,6 @@ struct timing_generator_funcs {
                        int group_idx,
                        uint32_t gsl_ready_signal);
        void (*set_out_mux)(struct timing_generator *tg, enum otg_out_mux_dest dest);
-       void (*set_vrr_m_const)(struct timing_generator *optc,
-                       double vtotal_avg);
        void (*set_drr_trigger_window)(struct timing_generator *optc,
                        uint32_t window_start, uint32_t window_end);
        void (*set_vtotal_change_limit)(struct timing_generator *optc,
--

2.35.1

#2 lore raw
In reply to Rodrigo Siqueira

Hi Siqueira

Quoted 29 lines · Rodrigo Siqueira

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.

---
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c        | 8 --------
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h        | 3 ---
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c        | 1 -
 drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h | 2 --
 4 files changed, 14 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c +0 -0
index d072997477dd..1782b9c26cf4 100644

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c void optc3_set_dsc_config(struct timing_generator *optc, · line 191

Quoted 8 lines
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c +0 -5
@@ -184,14 +184,6 @@ void optc3_set_dsc_config(struct timing_generator *optc,
 	REG_UPDATE(OTG_V_SYNC_A_CNTL, OTG_V_SYNC_MODE, 0);
 }
 
-void optc3_set_vrr_m_const(struct timing_generator *optc,
-		double vtotal_avg)
-{
-	DC_FP_START();
-	optc3_fpu_set_vrr_m_const(optc, vtotal_avg);

The function optc3_fpu_set_vrr_m_const is only used here, so by deleting it, the function optc3_fpu_set_vrr_m_const is declared but not used. Couldn't it be dropped also?

Best Regards,
- Maíra Canal

Quoted 45 lines
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c +0 -3
-	DC_FP_END();
-}
-
 void optc3_set_odm_bypass(struct timing_generator *optc,
 		const struct dc_crtc_timing *dc_crtc_timing)
 {
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h +0 -3
index 33bd12f5dc17..dd45a5499b07 100644
@@ -329,9 +329,6 @@ void optc3_lock_doublebuffer_enable(struct timing_generator *optc);
 
 void optc3_lock_doublebuffer_disable(struct timing_generator *optc);
 
-void optc3_set_vrr_m_const(struct timing_generator *optc,
-		double vtotal_avg);
-
 void optc3_set_drr_trigger_window(struct timing_generator *optc,
 		uint32_t window_start, uint32_t window_end);
 
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c +0 -1
index 992e56c6907e..eff1f4e17689 100644
@@ -281,7 +281,6 @@ static struct timing_generator_funcs dcn32_tg_funcs = {
 		.lock_doublebuffer_enable = optc3_lock_doublebuffer_enable,
 		.lock_doublebuffer_disable = optc3_lock_doublebuffer_disable,
 		.enable_optc_clock = optc1_enable_optc_clock,
-		.set_vrr_m_const = optc3_set_vrr_m_const,
 		.set_drr = optc31_set_drr, // TODO: Update to optc32_set_drr once FW headers are promoted
 		.get_last_used_drr_vtotal = optc2_get_last_used_drr_vtotal,
 		.set_vtotal_min_max = optc3_set_vtotal_min_max,
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +0 -2
index 62d4683f17a2..4cfa733cf96f 100644
@@ -302,8 +302,6 @@ struct timing_generator_funcs {
 			int group_idx,
 			uint32_t gsl_ready_signal);
 	void (*set_out_mux)(struct timing_generator *tg, enum otg_out_mux_dest dest);
-	void (*set_vrr_m_const)(struct timing_generator *optc,
-			double vtotal_avg);
 	void (*set_drr_trigger_window)(struct timing_generator *optc,
 			uint32_t window_start, uint32_t window_end);
 	void (*set_vtotal_change_limit)(struct timing_generator *optc,
Tested-by on v1 1/1
#3 lore raw
In reply to Rodrigo Siqueira
Quoted 17 lines · Rodrigo Siqueira

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.

Quoted 6 lines
---
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c        | 8 --------
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h        | 3 ---
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c        | 1 -
 drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h | 2 --
 4 files changed, 14 deletions(-)

Thanks, that fixes the build issue for me.

cheers