Commit d5a7fdc8 authored by Charlene Liu's avatar Charlene Liu Committed by Alex Deucher
Browse files

drm/amd/display: fix zero value for APU watermark_c 



[why]
the guard of is_apu not in sync, caused no watermark_c output.

Reviewed-by: default avatarOvidiu Bunea <ovidiu.bunea@amd.com>
Signed-off-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4a8396d5

drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c

+4 −1
Original line number Diff line number Diff line
@@ -661,6 +661,9 @@ static bool dml2_validate_and_build_resource(const struct dc *in_dc, struct dc_s 
		dml2_copy_clocks_to_dc_state(&out_clks, context);

		dml2_extract_watermark_set(&context->bw_ctx.bw.dcn.watermarks.a, &dml2->v20.dml_core_ctx);

		dml2_extract_watermark_set(&context->bw_ctx.bw.dcn.watermarks.b, &dml2->v20.dml_core_ctx);

		if (context->streams[0]->sink->link->dc->caps.is_apu)

			dml2_extract_watermark_set(&context->bw_ctx.bw.dcn.watermarks.c, &dml2->v20.dml_core_ctx);

		else

			memcpy(&context->bw_ctx.bw.dcn.watermarks.c, &dml2->v20.g6_temp_read_watermark_set, sizeof(context->bw_ctx.bw.dcn.watermarks.c));

		dml2_extract_watermark_set(&context->bw_ctx.bw.dcn.watermarks.d, &dml2->v20.dml_core_ctx);

		dml2_extract_writeback_wm(context, &dml2->v20.dml_core_ctx);