File tree Expand file tree Collapse file tree 4 files changed +1
-53
lines changed
drivers/gpu/drm/amd/display/dc Expand file tree Collapse file tree 4 files changed +1
-53
lines changed Original file line number Diff line number Diff line change @@ -178,10 +178,6 @@ struct stream_encoder_funcs {
178
178
void (* stop_dp_info_packets )(
179
179
struct stream_encoder * enc );
180
180
181
- void (* reset_fifo )(
182
- struct stream_encoder * enc
183
- );
184
-
185
181
void (* dp_blank )(
186
182
struct dc_link * link ,
187
183
struct stream_encoder * enc );
Original file line number Diff line number Diff line change @@ -584,13 +584,6 @@ bool get_temp_dp_link_res(struct dc_link *link,
584
584
struct link_resource * link_res ,
585
585
struct dc_link_settings * link_settings );
586
586
587
- #if defined(CONFIG_DRM_AMD_DC_FP )
588
- struct hpo_dp_link_encoder * resource_get_hpo_dp_link_enc_for_det_lt (
589
- const struct resource_context * res_ctx ,
590
- const struct resource_pool * pool ,
591
- const struct dc_link * link );
592
- #endif
593
-
594
587
void reset_syncd_pipes_from_disabled_pipes (struct dc * dc ,
595
588
struct dc_state * context );
596
589
Original file line number Diff line number Diff line change @@ -462,16 +462,6 @@ void optc2_setup_manual_trigger(struct timing_generator *optc)
462
462
{
463
463
struct optc * optc1 = DCN10TG_FROM_TG (optc );
464
464
465
- /* Set the min/max selectors unconditionally so that
466
- * DMCUB fw may change OTG timings when necessary
467
- * TODO: Remove the w/a after fixing the issue in DMCUB firmware
468
- */
469
- REG_UPDATE_4 (OTG_V_TOTAL_CONTROL ,
470
- OTG_V_TOTAL_MIN_SEL , 1 ,
471
- OTG_V_TOTAL_MAX_SEL , 1 ,
472
- OTG_FORCE_LOCK_ON_EVENT , 0 ,
473
- OTG_SET_V_TOTAL_MIN_MASK , (1 << 1 )); /* TRIGA */
474
-
475
465
REG_SET_8 (OTG_TRIGA_CNTL , 0 ,
476
466
OTG_TRIGA_SOURCE_SELECT , 21 ,
477
467
OTG_TRIGA_SOURCE_PIPE_SELECT , optc -> inst ,
Original file line number Diff line number Diff line change @@ -581,32 +581,6 @@ static const struct resource_caps res_cap_rn = {
581
581
.num_dsc = 3 ,
582
582
};
583
583
584
- #ifdef DIAGS_BUILD
585
- static const struct resource_caps res_cap_rn_FPGA_4pipe = {
586
- .num_timing_generator = 4 ,
587
- .num_opp = 4 ,
588
- .num_video_plane = 4 ,
589
- .num_audio = 7 ,
590
- .num_stream_encoder = 4 ,
591
- .num_pll = 4 ,
592
- .num_dwb = 1 ,
593
- .num_ddc = 4 ,
594
- .num_dsc = 0 ,
595
- };
596
-
597
- static const struct resource_caps res_cap_rn_FPGA_2pipe_dsc = {
598
- .num_timing_generator = 2 ,
599
- .num_opp = 2 ,
600
- .num_video_plane = 2 ,
601
- .num_audio = 7 ,
602
- .num_stream_encoder = 2 ,
603
- .num_pll = 4 ,
604
- .num_dwb = 1 ,
605
- .num_ddc = 4 ,
606
- .num_dsc = 2 ,
607
- };
608
- #endif
609
-
610
584
static const struct dc_plane_cap plane_cap = {
611
585
.type = DC_PLANE_TYPE_DCN_UNIVERSAL ,
612
586
.per_pixel_alpha = true,
@@ -1415,16 +1389,11 @@ static bool dcn21_resource_construct(
1415
1389
struct dc_context * ctx = dc -> ctx ;
1416
1390
struct irq_service_init_data init_data ;
1417
1391
uint32_t pipe_fuses = read_pipe_fuses (ctx );
1418
- uint32_t num_pipes ;
1392
+ uint32_t num_pipes = 0 ;
1419
1393
1420
1394
ctx -> dc_bios -> regs = & bios_regs ;
1421
1395
1422
1396
pool -> base .res_cap = & res_cap_rn ;
1423
- #ifdef DIAGS_BUILD
1424
- if (IS_FPGA_MAXIMUS_DC (dc -> ctx -> dce_environment ))
1425
- //pool->base.res_cap = &res_cap_nv10_FPGA_2pipe_dsc;
1426
- pool -> base .res_cap = & res_cap_rn_FPGA_4pipe ;
1427
- #endif
1428
1397
1429
1398
pool -> base .funcs = & dcn21_res_pool_funcs ;
1430
1399
You can’t perform that action at this time.
0 commit comments