drm/amd/display: fix chroma vp wa corner case

[Why]
Previous implementation we may have residual chroma address offset
if transition from wa enable -> wa disable.

[How]
Clear address offset cache when viewport updates. Also update the
vp size check condition to account for rotation angle

Signed-off-by: Eric Yang <Eric.Yang2@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c
index 216ae170bc50fedb5fe6a6a54fe640f4b190d79e..4d2564f793956ad12a01f7bf82addce41816aae6 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c
@@ -251,10 +251,20 @@ static void hubp21_apply_PLAT_54186_wa(
                        ROTATION_ANGLE, &rotation_angle,
                        H_MIRROR_EN, &h_mirror_en);
 
-       /* apply wa only for NV12 surface with scatter gather enabled with view port > 512 */
+       /* reset persistent cached data */
+       hubp21->PLAT_54186_wa_chroma_addr_offset = 0;
+       /* apply wa only for NV12 surface with scatter gather enabled with viewport > 512 along
+        * the vertical direction*/
        if (address->type != PLN_ADDR_TYPE_VIDEO_PROGRESSIVE ||
-                       address->video_progressive.luma_addr.high_part == 0xf4
-                       || viewport_c_height <= 512)
+                       address->video_progressive.luma_addr.high_part == 0xf4)
+               return;
+
+       if ((rotation_angle == 0 || rotation_angle == 180)
+                       && viewport_c_height <= 512)
+               return;
+
+       if ((rotation_angle == 90 || rotation_angle == 270)
+                               && viewport_c_width <= 512)
                return;
 
        switch (rotation_angle) {