From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F65F253358; Mon, 23 Jun 2025 13:39:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750685961; cv=none; b=D0gkMzAZaNUMUmXlr4g24ZwWkVSWhXNULh/fvddlg3UeUNfc/HUceO4/pbMHtN6XV4H4DkyCE0VG3aquj0HRa8HWhpj6pKxlapfa0Eh9OtlY738M8ZbX3tXzHYY9bB2807HkDQUVvgUhTnv/jUAXDr8CpQb3+0EqUgStpZRbBI0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750685961; c=relaxed/simple; bh=39+K4aWf0mFWekiuTWkhyNIAQS5B/6Vu5H9/FI1oxZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OFtq1CSG/9gSnIJ7irf9/gXBVsVPOGAVRbUHrAyIS+LcGDhpkhkRJsDp6bCYhYKOBsOjJyC9QXFRWqq5l4t+RbpqJrYFXmPTJh4CnMhEb5ral0GwTPrjjSfawFsh8pNkvKuCnehdSTfpdAG+onhK8krxOghqxHmh8EyF9yYzw3g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BSpRL+HV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BSpRL+HV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5BA1C4CEEA; Mon, 23 Jun 2025 13:39:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750685961; bh=39+K4aWf0mFWekiuTWkhyNIAQS5B/6Vu5H9/FI1oxZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BSpRL+HV8rsIhBcJWNuwNq+CP9M6iciBk4WT39+iVl0NmJaq25AWn63udpV57VuYV c4KuvhHXtsbZWXxKA5rxau7KrMOUPdrb4AiIIGPjiyC+vX3c/CzVZqxcnChEN7aB1A X2WtiL9jYVEBY/dI5fwYjoQg4MW4bXb+1T8qGLHU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ovidiu Bunea , Charlene Liu , Aurabindo Pillai , Daniel Wheeler , Alex Deucher , Sasha Levin Subject: [PATCH 6.15 273/592] drm/amd/display: fix zero value for APU watermark_c Date: Mon, 23 Jun 2025 15:03:51 +0200 Message-ID: <20250623130706.824547301@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130700.210182694@linuxfoundation.org> References: <20250623130700.210182694@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Charlene Liu [ Upstream commit d5a7fdc88a2d64242d959942cbd0e1499ebb9806 ] [why] the guard of is_apu not in sync, caused no watermark_c output. Reviewed-by: Ovidiu Bunea Signed-off-by: Charlene Liu Signed-off-by: Aurabindo Pillai Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c b/drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c index e89571874185e..525b7d04bf84c 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c +++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c @@ -663,7 +663,10 @@ 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); - memcpy(&context->bw_ctx.bw.dcn.watermarks.c, &dml2->v20.g6_temp_read_watermark_set, sizeof(context->bw_ctx.bw.dcn.watermarks.c)); + 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); //copy for deciding zstate use -- 2.39.5