Skip to content

Commit 998b7c8

Browse files
charliu-AMDENGjfvogel
authored andcommitted
drm/amd/display: fix dcn4x init failed
[ Upstream commit 23ef388a84c72b0614a6c10f866ffeac7e807719 ] [why] failed due to cmdtable not created. switch atombios cmdtable as default. Reviewed-by: Alvin Lee <[email protected]> Signed-off-by: Charlene Liu <[email protected]> Signed-off-by: Zaeem Mohamed <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit 990e4fb37bcd49161bbc5331a24b73616aefafbf) Signed-off-by: Jack Vogel <[email protected]>
1 parent 4d9e93a commit 998b7c8

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

drivers/gpu/drm/amd/display/dc/bios/command_table2.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ static void init_dig_encoder_control(struct bios_parser *bp)
101101
bp->cmd_tbl.dig_encoder_control = encoder_control_digx_v1_5;
102102
break;
103103
default:
104-
dm_output_to_console("Don't have dig_encoder_control for v%d\n", version);
105104
bp->cmd_tbl.dig_encoder_control = encoder_control_fallback;
106105
break;
107106
}
@@ -238,7 +237,6 @@ static void init_transmitter_control(struct bios_parser *bp)
238237
bp->cmd_tbl.transmitter_control = transmitter_control_v1_7;
239238
break;
240239
default:
241-
dm_output_to_console("Don't have transmitter_control for v%d\n", crev);
242240
bp->cmd_tbl.transmitter_control = transmitter_control_fallback;
243241
break;
244242
}
@@ -408,8 +406,6 @@ static void init_set_pixel_clock(struct bios_parser *bp)
408406
bp->cmd_tbl.set_pixel_clock = set_pixel_clock_v7;
409407
break;
410408
default:
411-
dm_output_to_console("Don't have set_pixel_clock for v%d\n",
412-
BIOS_CMD_TABLE_PARA_REVISION(setpixelclock));
413409
bp->cmd_tbl.set_pixel_clock = set_pixel_clock_fallback;
414410
break;
415411
}
@@ -554,7 +550,6 @@ static void init_set_crtc_timing(struct bios_parser *bp)
554550
set_crtc_using_dtd_timing_v3;
555551
break;
556552
default:
557-
dm_output_to_console("Don't have set_crtc_timing for v%d\n", dtd_version);
558553
bp->cmd_tbl.set_crtc_timing = NULL;
559554
break;
560555
}
@@ -671,8 +666,6 @@ static void init_enable_crtc(struct bios_parser *bp)
671666
bp->cmd_tbl.enable_crtc = enable_crtc_v1;
672667
break;
673668
default:
674-
dm_output_to_console("Don't have enable_crtc for v%d\n",
675-
BIOS_CMD_TABLE_PARA_REVISION(enablecrtc));
676669
bp->cmd_tbl.enable_crtc = NULL;
677670
break;
678671
}
@@ -864,8 +857,6 @@ static void init_set_dce_clock(struct bios_parser *bp)
864857
bp->cmd_tbl.set_dce_clock = set_dce_clock_v2_1;
865858
break;
866859
default:
867-
dm_output_to_console("Don't have set_dce_clock for v%d\n",
868-
BIOS_CMD_TABLE_PARA_REVISION(setdceclock));
869860
bp->cmd_tbl.set_dce_clock = NULL;
870861
break;
871862
}

drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
8787
return true;
8888

8989
default:
90-
/* Unsupported DCE */
91-
BREAK_TO_DEBUGGER();
90+
*h = dal_cmd_tbl_helper_dce112_get_table2();
9291
return false;
9392
}
9493
}

0 commit comments

Comments
 (0)