File tree Expand file tree Collapse file tree 8 files changed +0
-16
lines changed
drivers/gpu/drm/amd/display/dc Expand file tree Collapse file tree 8 files changed +0
-16
lines changed Original file line number Diff line number Diff line change @@ -707,9 +707,7 @@ void rn_clk_mgr_construct(
707
707
int is_green_sardine = 0 ;
708
708
struct clk_log_info log_info = {0 };
709
709
710
- #if defined(CONFIG_DRM_AMD_DC_FP )
711
710
is_green_sardine = ASICREV_IS_GREEN_SARDINE (ctx -> asic_id .hw_internal_rev );
712
- #endif
713
711
714
712
clk_mgr -> base .ctx = ctx ;
715
713
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 {
2222
2222
// 'true' if these are virtual DPCD's DSC caps (immediately upstream of sink in MST topology),
2223
2223
// 'false' if they are sink's DSC caps
2224
2224
bool is_virtual_dpcd_dsc ;
2225
- #if defined(CONFIG_DRM_AMD_DC_FP )
2226
2225
// 'true' if MST topology supports DSC passthrough for sink
2227
2226
// 'false' if MST topology does not support DSC passthrough
2228
2227
bool is_dsc_passthrough_supported ;
2229
- #endif
2230
2228
struct dsc_dec_dpcd_caps dsc_dec_caps ;
2231
2229
};
2232
2230
Original file line number Diff line number Diff line change @@ -827,9 +827,7 @@ struct dc_dsc_config {
827
827
uint32_t version_minor ; /* DSC minor version. Full version is formed as 1.version_minor. */
828
828
bool ycbcr422_simple ; /* Tell DSC engine to convert YCbCr 4:2:2 to 'YCbCr 4:2:2 simple'. */
829
829
int32_t rc_buffer_size ; /* DSC RC buffer block size in bytes */
830
- #if defined(CONFIG_DRM_AMD_DC_FP )
831
830
bool is_frl ; /* indicate if DSC is applied based on HDMI FRL sink's capability */
832
- #endif
833
831
bool is_dp ; /* indicate if DSC is applied based on DP's capability */
834
832
uint32_t mst_pbn ; /* pbn of display on dsc mst hub */
835
833
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)
98
98
for (i = 0 ; i < dc -> res_pool -> stream_enc_count ; i ++ )
99
99
if (dc -> res_pool -> stream_enc [i ]-> vpg )
100
100
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 )
102
101
for (i = 0 ; i < dc -> res_pool -> hpo_dp_stream_enc_count ; i ++ )
103
102
dc -> res_pool -> hpo_dp_stream_enc [i ]-> vpg -> funcs -> vpg_powerdown (dc -> res_pool -> hpo_dp_stream_enc [i ]-> vpg );
104
- #endif
105
103
}
106
104
107
105
}
Original file line number Diff line number Diff line change @@ -155,7 +155,6 @@ struct hwseq_private_funcs {
155
155
void (* setup_hpo_hw_control )(const struct dce_hwseq * hws , bool enable );
156
156
void (* enable_plane )(struct dc * dc , struct pipe_ctx * pipe_ctx ,
157
157
struct dc_state * context );
158
- #ifdef CONFIG_DRM_AMD_DC_FP
159
158
void (* program_mall_pipe_config )(struct dc * dc , struct dc_state * context );
160
159
void (* update_force_pstate )(struct dc * dc , struct dc_state * context );
161
160
void (* update_mall_sel )(struct dc * dc , struct dc_state * context );
@@ -170,7 +169,6 @@ struct hwseq_private_funcs {
170
169
struct dc_state * context ,
171
170
struct dc * dc );
172
171
bool (* is_dp_dig_pixel_rate_div_policy )(struct pipe_ctx * pipe_ctx );
173
- #endif
174
172
void (* reset_back_end_for_pipe )(struct dc * dc ,
175
173
struct pipe_ctx * pipe_ctx ,
176
174
struct dc_state * context );
Original file line number Diff line number Diff line change @@ -157,9 +157,7 @@ struct hubp_funcs {
157
157
158
158
void (* set_blank )(struct hubp * hubp , bool blank );
159
159
void (* set_blank_regs )(struct hubp * hubp , bool blank );
160
- #ifdef CONFIG_DRM_AMD_DC_FP
161
160
void (* phantom_hubp_post_enable )(struct hubp * hubp );
162
- #endif
163
161
void (* set_hubp_blank_en )(struct hubp * hubp , bool blank );
164
162
165
163
void (* set_cursor_attributes )(
Original file line number Diff line number Diff line change @@ -182,9 +182,7 @@ struct timing_generator_funcs {
182
182
183
183
bool (* enable_crtc )(struct timing_generator * tg );
184
184
bool (* disable_crtc )(struct timing_generator * tg );
185
- #ifdef CONFIG_DRM_AMD_DC_FP
186
185
void (* phantom_crtc_post_enable )(struct timing_generator * tg );
187
- #endif
188
186
void (* disable_phantom_crtc )(struct timing_generator * tg );
189
187
bool (* immediate_disable_crtc )(struct timing_generator * tg );
190
188
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(
125
125
if (dongle_caps -> dp_hdmi_frl_max_link_bw_in_kbps > 0 ) { // DP to HDMI FRL converter
126
126
struct dc_crtc_timing outputTiming = * timing ;
127
127
128
- #if defined(CONFIG_DRM_AMD_DC_FP )
129
128
if (timing -> flags .DSC && !timing -> dsc_cfg .is_frl )
130
129
/* DP input has DSC, HDMI FRL output doesn't have DSC, remove DSC from output timing */
131
130
outputTiming .flags .DSC = 0 ;
132
- #endif
133
131
if (dc_bandwidth_in_kbps_from_timing (& outputTiming , DC_LINK_ENCODING_HDMI_FRL ) >
134
132
dongle_caps -> dp_hdmi_frl_max_link_bw_in_kbps )
135
133
return false;
You can’t perform that action at this time.
0 commit comments