File tree Expand file tree Collapse file tree
drivers/gpu/drm/amd/display/dc Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -707,9 +707,7 @@ void rn_clk_mgr_construct(
707707 int is_green_sardine = 0 ;
708708 struct clk_log_info log_info = {0 };
709709
710- #if defined(CONFIG_DRM_AMD_DC_FP )
711710 is_green_sardine = ASICREV_IS_GREEN_SARDINE (ctx -> asic_id .hw_internal_rev );
712- #endif
713711
714712 clk_mgr -> base .ctx = ctx ;
715713 clk_mgr -> base .funcs = & dcn21_funcs ;
Original file line number Diff line number Diff line change @@ -2222,11 +2222,9 @@ struct dc_sink_dsc_caps {
22222222 // 'true' if these are virtual DPCD's DSC caps (immediately upstream of sink in MST topology),
22232223 // 'false' if they are sink's DSC caps
22242224 bool is_virtual_dpcd_dsc ;
2225- #if defined(CONFIG_DRM_AMD_DC_FP )
22262225 // 'true' if MST topology supports DSC passthrough for sink
22272226 // 'false' if MST topology does not support DSC passthrough
22282227 bool is_dsc_passthrough_supported ;
2229- #endif
22302228 struct dsc_dec_dpcd_caps dsc_dec_caps ;
22312229};
22322230
Original file line number Diff line number Diff line change @@ -827,9 +827,7 @@ struct dc_dsc_config {
827827 uint32_t version_minor ; /* DSC minor version. Full version is formed as 1.version_minor. */
828828 bool ycbcr422_simple ; /* Tell DSC engine to convert YCbCr 4:2:2 to 'YCbCr 4:2:2 simple'. */
829829 int32_t rc_buffer_size ; /* DSC RC buffer block size in bytes */
830- #if defined(CONFIG_DRM_AMD_DC_FP )
831830 bool is_frl ; /* indicate if DSC is applied based on HDMI FRL sink's capability */
832- #endif
833831 bool is_dp ; /* indicate if DSC is applied based on DP's capability */
834832 uint32_t mst_pbn ; /* pbn of display on dsc mst hub */
835833 const struct dc_dsc_rc_params_override * rc_params_ovrd ; /* DM owned memory. If not NULL, apply custom dsc rc params */
Original file line number Diff line number Diff line change @@ -98,10 +98,8 @@ static void enable_memory_low_power(struct dc *dc)
9898 for (i = 0 ; i < dc -> res_pool -> stream_enc_count ; i ++ )
9999 if (dc -> res_pool -> stream_enc [i ]-> vpg )
100100 dc -> res_pool -> stream_enc [i ]-> vpg -> funcs -> vpg_powerdown (dc -> res_pool -> stream_enc [i ]-> vpg );
101- #if defined(CONFIG_DRM_AMD_DC_FP )
102101 for (i = 0 ; i < dc -> res_pool -> hpo_dp_stream_enc_count ; i ++ )
103102 dc -> res_pool -> hpo_dp_stream_enc [i ]-> vpg -> funcs -> vpg_powerdown (dc -> res_pool -> hpo_dp_stream_enc [i ]-> vpg );
104- #endif
105103 }
106104
107105}
Original file line number Diff line number Diff line change @@ -155,7 +155,6 @@ struct hwseq_private_funcs {
155155 void (* setup_hpo_hw_control )(const struct dce_hwseq * hws , bool enable );
156156 void (* enable_plane )(struct dc * dc , struct pipe_ctx * pipe_ctx ,
157157 struct dc_state * context );
158- #ifdef CONFIG_DRM_AMD_DC_FP
159158 void (* program_mall_pipe_config )(struct dc * dc , struct dc_state * context );
160159 void (* update_force_pstate )(struct dc * dc , struct dc_state * context );
161160 void (* update_mall_sel )(struct dc * dc , struct dc_state * context );
@@ -170,7 +169,6 @@ struct hwseq_private_funcs {
170169 struct dc_state * context ,
171170 struct dc * dc );
172171 bool (* is_dp_dig_pixel_rate_div_policy )(struct pipe_ctx * pipe_ctx );
173- #endif
174172 void (* reset_back_end_for_pipe )(struct dc * dc ,
175173 struct pipe_ctx * pipe_ctx ,
176174 struct dc_state * context );
Original file line number Diff line number Diff line change @@ -157,9 +157,7 @@ struct hubp_funcs {
157157
158158 void (* set_blank )(struct hubp * hubp , bool blank );
159159 void (* set_blank_regs )(struct hubp * hubp , bool blank );
160- #ifdef CONFIG_DRM_AMD_DC_FP
161160 void (* phantom_hubp_post_enable )(struct hubp * hubp );
162- #endif
163161 void (* set_hubp_blank_en )(struct hubp * hubp , bool blank );
164162
165163 void (* set_cursor_attributes )(
Original file line number Diff line number Diff line change @@ -182,9 +182,7 @@ struct timing_generator_funcs {
182182
183183 bool (* enable_crtc )(struct timing_generator * tg );
184184 bool (* disable_crtc )(struct timing_generator * tg );
185- #ifdef CONFIG_DRM_AMD_DC_FP
186185 void (* phantom_crtc_post_enable )(struct timing_generator * tg );
187- #endif
188186 void (* disable_phantom_crtc )(struct timing_generator * tg );
189187 bool (* immediate_disable_crtc )(struct timing_generator * tg );
190188 bool (* is_counter_moving )(struct timing_generator * tg );
Original file line number Diff line number Diff line change @@ -125,11 +125,9 @@ static bool dp_active_dongle_validate_timing(
125125 if (dongle_caps -> dp_hdmi_frl_max_link_bw_in_kbps > 0 ) { // DP to HDMI FRL converter
126126 struct dc_crtc_timing outputTiming = * timing ;
127127
128- #if defined(CONFIG_DRM_AMD_DC_FP )
129128 if (timing -> flags .DSC && !timing -> dsc_cfg .is_frl )
130129 /* DP input has DSC, HDMI FRL output doesn't have DSC, remove DSC from output timing */
131130 outputTiming .flags .DSC = 0 ;
132- #endif
133131 if (dc_bandwidth_in_kbps_from_timing (& outputTiming , DC_LINK_ENCODING_HDMI_FRL ) >
134132 dongle_caps -> dp_hdmi_frl_max_link_bw_in_kbps )
135133 return false;
You can’t perform that action at this time.
0 commit comments