Skip to content

Commit 0d5fd22

Browse files
emilynie1alexdeucher
authored andcommitted
drm/amd/display: disabling p-state checks for DCN31 and DCN314
[Why] IGT displays Dmesg warnings which are likely false [How] Disabling p-state checks leading to this warning for DCN31 and DCN314 Reviewed-by: Nicholas Kazlauskas <[email protected]> Signed-off-by: Emily Nie <[email protected]> Signed-off-by: Hamza Mahfooz <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent bd4b1e3 commit 0d5fd22

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,29 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev)
13071307
DRM_INFO("DMUB hardware initialized: version=0x%08X\n",
13081308
adev->dm.dmcub_fw_version);
13091309

1310+
/* Keeping sanity checks off if
1311+
* DCN31 >= 4.0.59.0
1312+
* DCN314 >= 8.0.16.0
1313+
* Otherwise, turn on sanity checks
1314+
*/
1315+
switch (amdgpu_ip_version(adev, DCE_HWIP, 0)) {
1316+
case IP_VERSION(3, 1, 2):
1317+
case IP_VERSION(3, 1, 3):
1318+
if (adev->dm.dmcub_fw_version &&
1319+
adev->dm.dmcub_fw_version >= DMUB_FW_VERSION(4, 0, 0) &&
1320+
adev->dm.dmcub_fw_version < DMUB_FW_VERSION(4, 0, 59))
1321+
adev->dm.dc->debug.sanity_checks = true;
1322+
break;
1323+
case IP_VERSION(3, 1, 4):
1324+
if (adev->dm.dmcub_fw_version &&
1325+
adev->dm.dmcub_fw_version >= DMUB_FW_VERSION(4, 0, 0) &&
1326+
adev->dm.dmcub_fw_version < DMUB_FW_VERSION(8, 0, 16))
1327+
adev->dm.dc->debug.sanity_checks = true;
1328+
break;
1329+
default:
1330+
break;
1331+
}
1332+
13101333
return 0;
13111334
}
13121335

drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ static const struct dc_debug_options debug_defaults_drv = {
868868
.max_downscale_src_width = 4096,/*upto true 4K*/
869869
.disable_pplib_wm_range = false,
870870
.scl_reset_length10 = true,
871-
.sanity_checks = true,
871+
.sanity_checks = false,
872872
.underflow_assert_delay_us = 0xFFFFFFFF,
873873
.dwb_fi_phase = -1, // -1 = disable,
874874
.dmub_command_table = true,

drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ static const struct dc_debug_options debug_defaults_drv = {
888888
.max_downscale_src_width = 4096,/*upto true 4k*/
889889
.disable_pplib_wm_range = false,
890890
.scl_reset_length10 = true,
891-
.sanity_checks = true,
891+
.sanity_checks = false,
892892
.underflow_assert_delay_us = 0xFFFFFFFF,
893893
.dwb_fi_phase = -1, // -1 = disable,
894894
.dmub_command_table = true,

0 commit comments

Comments
 (0)