From: Sung Joon Kim <sungkim@amd.com>
Date: Thu, 17 Aug 2023 16:21:55 +0000 (-0400)
Subject: drm/amd/display: Fix Chroma Surface height/width initialization
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=969fe903ee2ea8e6a7781608ca2ee72d9b748c00;p=linux.git

drm/amd/display: Fix Chroma Surface height/width initialization

[why]
Surface height/width for Chroma has another variable that it should be
intialized to, chroma_size. Fixing this will help pass DML2.0 validation
for YCbCr420 tests, DCHB006.109,129, DCHB014.011,012.

[how]
Assign SurfaceHeight/WidthC to chroma_size.height/width

Reviewed-by: Charlene Liu <charlene.liu@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Sung Joon Kim <sungkim@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c b/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c
index 2dd8eedfc17dc..e5ccd2887c943 100644
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c
@@ -721,8 +721,8 @@ static void populate_dml_surface_cfg_from_plane_state(enum dml_project_id dml2_p
 	out->PitchY[location] = in->plane_size.surface_pitch;
 	out->SurfaceHeightY[location] = in->plane_size.surface_size.height;
 	out->SurfaceWidthY[location] = in->plane_size.surface_size.width;
-	out->SurfaceHeightC[location] = in->plane_size.surface_size.height;
-	out->SurfaceWidthC[location] = in->plane_size.surface_size.width;
+	out->SurfaceHeightC[location] = in->plane_size.chroma_size.height;
+	out->SurfaceWidthC[location] = in->plane_size.chroma_size.width;
 	out->PitchC[location] = in->plane_size.chroma_pitch;
 	out->DCCEnable[location] = in->dcc.enable;
 	out->DCCMetaPitchY[location] = in->dcc.meta_pitch;