Commit 17b6527d authored by Rodrigo Siqueira's avatar Rodrigo Siqueira Committed by Alex Deucher
Browse files

drm/amd/display: Improve FAM control for DCN401 



[why & how]
When the commit 5324e2b2 ("drm/amd/display: Add driver support for
future FAMS versions") was introduced, it missed some of the FAM2 code.
This commit introduces the code that control the FAM enable and disable.

Fixes: 5324e2b2 ("drm/amd/display: Add driver support for future FAMS versions")
Acked-by: default avatarWayne Lin <wayne.lin@amd.com>
Signed-off-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5ac2557d

drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c

+12 −1
Original line number Diff line number Diff line
@@ -985,8 +985,19 @@ void dcn32_init_hw(struct dc *dc) 
		dc->caps.dmub_caps.gecc_enable = dc->ctx->dmub_srv->dmub->feature_caps.gecc_enable;

		dc->caps.dmub_caps.mclk_sw = dc->ctx->dmub_srv->dmub->feature_caps.fw_assisted_mclk_switch_ver;



		if (dc->ctx->dmub_srv->dmub->fw_version <

		/* for DCN401 testing only */

		dc->caps.dmub_caps.fams_ver = dc->ctx->dmub_srv->dmub->feature_caps.fw_assisted_mclk_switch_ver;

		if (dc->caps.dmub_caps.fams_ver == 2) {

			/* FAMS2 is enabled */

			dc->debug.fams2_config.bits.enable &= true;

		} else if (dc->ctx->dmub_srv->dmub->fw_version <

				DMUB_FW_VERSION(7, 0, 35)) {

			/* FAMS2 is disabled */

			dc->debug.fams2_config.bits.enable = false;

			if (dc->debug.using_dml2 && dc->res_pool->funcs->update_bw_bounding_box) {

				/* update bounding box if FAMS2 disabled */

				dc->res_pool->funcs->update_bw_bounding_box(dc, dc->clk_mgr->bw_params);

			}

			dc->debug.force_disable_subvp = true;

			dc->debug.disable_fpo_optimizations = true;

		}