Commit 2430be71 authored by Angus Wang's avatar Angus Wang Committed by Alex Deucher
Browse files

drm/amd/display: Fix LTTPR not Enabled 



[WHY]
Previous LTTPR change has caused a regression that led to an
issue where LTTPR is disabled

[HOW]
Extended changes from previous fix to DCN30X

Reviewed-by: default avatarWesley Chalmers <wesley.chalmers@amd.com>
Reviewed-by: default avatarMartin Leung <Martin.Leung@amd.com>
Reviewed-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarAngus Wang <angus.wang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 430bb83d

drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c

+17 −0
Original line number Diff line number Diff line
@@ -1485,6 +1485,23 @@ static bool dcn301_resource_construct( 
	dc->caps.color.mpc.ogam_rom_caps.hlg = 0;

	dc->caps.color.mpc.ocsc = 1;



	/* read VBIOS LTTPR caps */

	if (ctx->dc_bios->funcs->get_lttpr_caps) {

		enum bp_result bp_query_result;

		uint8_t is_vbios_lttpr_enable = 0;



		bp_query_result = ctx->dc_bios->funcs->get_lttpr_caps(ctx->dc_bios, &is_vbios_lttpr_enable);

		dc->caps.vbios_lttpr_enable = (bp_query_result == BP_RESULT_OK) && !!is_vbios_lttpr_enable;

	}



	if (ctx->dc_bios->funcs->get_lttpr_interop) {

		enum bp_result bp_query_result;

		uint8_t is_vbios_interop_enabled = 0;



		bp_query_result = ctx->dc_bios->funcs->get_lttpr_interop(ctx->dc_bios, &is_vbios_interop_enabled);

		dc->caps.vbios_lttpr_aware = (bp_query_result == BP_RESULT_OK) && !!is_vbios_interop_enabled;

	}



	if (dc->ctx->dce_environment == DCE_ENV_PRODUCTION_DRV)

		dc->debug = debug_defaults_drv;

	else if (dc->ctx->dce_environment == DCE_ENV_FPGA_MAXIMUS) {

drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c

+18 −0
Original line number Diff line number Diff line
@@ -1557,6 +1557,24 @@ static bool dcn302_resource_construct( 
	dc->caps.color.mpc.ogam_rom_caps.hlg = 0;

	dc->caps.color.mpc.ocsc = 1;



	/* read VBIOS LTTPR caps */

	if (ctx->dc_bios->funcs->get_lttpr_caps) {

		enum bp_result bp_query_result;

		uint8_t is_vbios_lttpr_enable = 0;



		bp_query_result = ctx->dc_bios->funcs->get_lttpr_caps(ctx->dc_bios, &is_vbios_lttpr_enable);

		dc->caps.vbios_lttpr_enable = (bp_query_result == BP_RESULT_OK) && !!is_vbios_lttpr_enable;

	}



	if (ctx->dc_bios->funcs->get_lttpr_interop) {

		enum bp_result bp_query_result;

		uint8_t is_vbios_interop_enabled = 0;



		bp_query_result = ctx->dc_bios->funcs->get_lttpr_interop(ctx->dc_bios,

				&is_vbios_interop_enabled);

		dc->caps.vbios_lttpr_aware = (bp_query_result == BP_RESULT_OK) && !!is_vbios_interop_enabled;

	}



	if (dc->ctx->dce_environment == DCE_ENV_PRODUCTION_DRV)

		dc->debug = debug_defaults_drv;

	else

drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c

+17 −0
Original line number Diff line number Diff line
@@ -1500,6 +1500,23 @@ static bool dcn303_resource_construct( 
	dc->caps.color.mpc.ogam_rom_caps.hlg = 0;

	dc->caps.color.mpc.ocsc = 1;



	/* read VBIOS LTTPR caps */

	if (ctx->dc_bios->funcs->get_lttpr_caps) {

		enum bp_result bp_query_result;

		uint8_t is_vbios_lttpr_enable = 0;



		bp_query_result = ctx->dc_bios->funcs->get_lttpr_caps(ctx->dc_bios, &is_vbios_lttpr_enable);

		dc->caps.vbios_lttpr_enable = (bp_query_result == BP_RESULT_OK) && !!is_vbios_lttpr_enable;

	}



	if (ctx->dc_bios->funcs->get_lttpr_interop) {

		enum bp_result bp_query_result;

		uint8_t is_vbios_interop_enabled = 0;



		bp_query_result = ctx->dc_bios->funcs->get_lttpr_interop(ctx->dc_bios, &is_vbios_interop_enabled);

		dc->caps.vbios_lttpr_aware = (bp_query_result == BP_RESULT_OK) && !!is_vbios_interop_enabled;

	}



	if (dc->ctx->dce_environment == DCE_ENV_PRODUCTION_DRV)

		dc->debug = debug_defaults_drv;

	else