Skip to content

Commit 2728e9c

Browse files
effective-lightalexdeucher
authored andcommitted
drm/amd/display: add DC changes for DCN351
Add DC support for DCN 3.5.1. Signed-off-by: Hamza Mahfooz <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 22b6670 commit 2728e9c

File tree

13 files changed

+2801
-4
lines changed

13 files changed

+2801
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
8181
case DCN_VERSION_3_2:
8282
case DCN_VERSION_3_21:
8383
case DCN_VERSION_3_5:
84+
case DCN_VERSION_3_51:
8485
*h = dal_cmd_tbl_helper_dce112_get_table2();
8586
return true;
8687

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
#include "dcn32/dcn32_resource.h"
7474
#include "dcn321/dcn321_resource.h"
7575
#include "dcn35/dcn35_resource.h"
76+
#include "dcn351/dcn351_resource.h"
7677

7778
#define VISUAL_CONFIRM_BASE_DEFAULT 3
7879
#define VISUAL_CONFIRM_BASE_MIN 1
@@ -195,6 +196,8 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
195196
break;
196197
case AMDGPU_FAMILY_GC_11_5_0:
197198
dc_version = DCN_VERSION_3_5;
199+
if (ASICREV_IS_GC_11_0_4(asic_id.hw_internal_rev))
200+
dc_version = DCN_VERSION_3_51;
198201
break;
199202
default:
200203
dc_version = DCE_VERSION_UNKNOWN;
@@ -303,6 +306,9 @@ struct resource_pool *dc_create_resource_pool(struct dc *dc,
303306
case DCN_VERSION_3_5:
304307
res_pool = dcn35_create_resource_pool(init_data, dc);
305308
break;
309+
case DCN_VERSION_3_51:
310+
res_pool = dcn351_create_resource_pool(init_data, dc);
311+
break;
306312
#endif /* CONFIG_DRM_AMD_DC_FP */
307313
default:
308314
break;

drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_stream_encoder.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "dcn30/dcn30_vpg.h"
2929
#include "dcn30/dcn30_afmt.h"
3030
#include "stream_encoder.h"
31+
#include "dcn10/dcn10_link_encoder.h"
3132
#include "dcn20/dcn20_stream_encoder.h"
3233

3334
/* Register bit field name change */

drivers/gpu/drm/amd/display/dc/dml/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn32/display_rq_dlg_calc_32.o := $(dml_ccflags)
9292
CFLAGS_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_ccflags) $(frame_warn_flag)
9393
CFLAGS_$(AMDDALPATH)/dc/dml/dcn321/dcn321_fpu.o := $(dml_ccflags)
9494
CFLAGS_$(AMDDALPATH)/dc/dml/dcn35/dcn35_fpu.o := $(dml_ccflags)
95+
CFLAGS_$(AMDDALPATH)/dc/dml/dcn351/dcn351_fpu.o := $(dml_ccflags)
9596
CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/dcn31_fpu.o := $(dml_ccflags)
9697
CFLAGS_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o := $(dml_ccflags)
9798
CFLAGS_$(AMDDALPATH)/dc/dml/dcn302/dcn302_fpu.o := $(dml_ccflags)
@@ -126,6 +127,7 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/dcn30_fpu.o := $(dml_rcflags)
126127
CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/dcn32_fpu.o := $(dml_rcflags)
127128
CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn321/dcn321_fpu.o := $(dml_rcflags)
128129
CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn35/dcn35_fpu.o := $(dml_rcflags)
130+
CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn351/dcn351_fpu.o := $(dml_rcflags)
129131
CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/dcn31_fpu.o := $(dml_rcflags)
130132
CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn302/dcn302_fpu.o := $(dml_rcflags)
131133
CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn303/dcn303_fpu.o := $(dml_rcflags)
@@ -157,6 +159,7 @@ DML += dcn302/dcn302_fpu.o
157159
DML += dcn303/dcn303_fpu.o
158160
DML += dcn314/dcn314_fpu.o
159161
DML += dcn35/dcn35_fpu.o
162+
DML += dcn351/dcn351_fpu.o
160163
DML += dsc/rc_calc_fpu.o
161164
DML += calcs/dcn_calcs.o calcs/dcn_calc_math.o calcs/dcn_calc_auto.o
162165
endif

0 commit comments

Comments
 (0)