Skip to content

Commit 10740e4

Browse files
effective-lightalexdeucher
authored andcommitted
drm/amd/display: add amdgpu_dm support for DCN351
Add Display Manager specific changes for DCN3.5.1. Signed-off-by: Hamza Mahfooz <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 2728e9c commit 10740e4

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,6 +1219,7 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev)
12191219
case IP_VERSION(3, 1, 3):
12201220
case IP_VERSION(3, 1, 4):
12211221
case IP_VERSION(3, 5, 0):
1222+
case IP_VERSION(3, 5, 1):
12221223
hw_params.dpia_supported = true;
12231224
hw_params.disable_dpia = adev->dm.dc->debug.dpia_debug.bits.disable_dpia;
12241225
break;
@@ -2040,6 +2041,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev)
20402041
case IP_VERSION(3, 2, 0):
20412042
case IP_VERSION(3, 2, 1):
20422043
case IP_VERSION(3, 5, 0):
2044+
case IP_VERSION(3, 5, 1):
20432045
return 0;
20442046
default:
20452047
break;
@@ -2160,6 +2162,7 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev)
21602162
dmub_asic = DMUB_ASIC_DCN321;
21612163
break;
21622164
case IP_VERSION(3, 5, 0):
2165+
case IP_VERSION(3, 5, 1):
21632166
dmub_asic = DMUB_ASIC_DCN35;
21642167
break;
21652168
default:
@@ -4489,6 +4492,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
44894492
case IP_VERSION(3, 2, 1):
44904493
case IP_VERSION(2, 1, 0):
44914494
case IP_VERSION(3, 5, 0):
4495+
case IP_VERSION(3, 5, 1):
44924496
if (register_outbox_irq_handlers(dm->adev)) {
44934497
DRM_ERROR("DM: Failed to initialize IRQ\n");
44944498
goto fail;
@@ -4510,6 +4514,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
45104514
case IP_VERSION(3, 2, 0):
45114515
case IP_VERSION(3, 2, 1):
45124516
case IP_VERSION(3, 5, 0):
4517+
case IP_VERSION(3, 5, 1):
45134518
psr_feature_enabled = true;
45144519
break;
45154520
default:
@@ -4527,6 +4532,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
45274532
case IP_VERSION(3, 2, 0):
45284533
case IP_VERSION(3, 2, 1):
45294534
case IP_VERSION(3, 5, 0):
4535+
case IP_VERSION(3, 5, 1):
45304536
replay_feature_enabled = true;
45314537
break;
45324538
default:
@@ -4679,6 +4685,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
46794685
case IP_VERSION(3, 2, 0):
46804686
case IP_VERSION(3, 2, 1):
46814687
case IP_VERSION(3, 5, 0):
4688+
case IP_VERSION(3, 5, 1):
46824689
if (dcn10_register_irq_handlers(dm->adev)) {
46834690
DRM_ERROR("DM: Failed to initialize IRQ\n");
46844691
goto fail;
@@ -4810,6 +4817,7 @@ static int dm_init_microcode(struct amdgpu_device *adev)
48104817
fw_name_dmub = FIRMWARE_DCN_V3_2_1_DMCUB;
48114818
break;
48124819
case IP_VERSION(3, 5, 0):
4820+
case IP_VERSION(3, 5, 1):
48134821
fw_name_dmub = FIRMWARE_DCN_35_DMUB;
48144822
break;
48154823
default:
@@ -4935,6 +4943,7 @@ static int dm_early_init(void *handle)
49354943
case IP_VERSION(3, 2, 0):
49364944
case IP_VERSION(3, 2, 1):
49374945
case IP_VERSION(3, 5, 0):
4946+
case IP_VERSION(3, 5, 1):
49384947
adev->mode_info.num_crtc = 4;
49394948
adev->mode_info.num_hpd = 4;
49404949
adev->mode_info.num_dig = 4;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,7 @@ struct hdcp_workqueue *hdcp_create_workqueue(struct amdgpu_device *adev,
741741
dc->ctx->dce_version == DCN_VERSION_3_14 ||
742742
dc->ctx->dce_version == DCN_VERSION_3_15 ||
743743
dc->ctx->dce_version == DCN_VERSION_3_5 ||
744+
dc->ctx->dce_version == DCN_VERSION_3_51 ||
744745
dc->ctx->dce_version == DCN_VERSION_3_16)
745746
hdcp_work[i].hdcp.config.psp.caps.dtm_v3_supported = 1;
746747
hdcp_work[i].hdcp.config.ddc.handle = dc_get_link_at_index(dc, i);

0 commit comments

Comments
 (0)