drm/amd/display: Disable chroma viewport w/a when rotated 180 degrees

[WHY]
Previous Renoir chroma viewport workaround fixed an MPO flicker by
increasing the chroma viewport size. However, when the MPO plane is
rotated 180 degrees, the viewport is read in reverse. Since the workaround
increases viewport size, when reading in reverse it causes a vertical
chroma offset.

[HOW]
Pass rotation value to viewport set functions
Temporarily disable the chroma viewport w/a when hubp is rotated 180 degrees

Signed-off-by: Michael Strauss <michael.strauss@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
index 31b64733d693576b23e751616b5be1c8c34fed7e..4d1301e5eaf59a4c76a18673f26f1d037cac3831 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
@@ -810,7 +810,8 @@ static void hubp1_set_vm_context0_settings(struct hubp *hubp,
 void min_set_viewport(
        struct hubp *hubp,
        const struct rect *viewport,
-       const struct rect *viewport_c)
+       const struct rect *viewport_c,
+       enum dc_rotation_angle rotation)
 {
        struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
index 780af5b3c16f051343cc02024a003db1f8bf5651..e44eaae5033bd2717ddb375ef9c6d8514f766b8e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
@@ -749,7 +749,9 @@ void hubp1_set_blank(struct hubp *hubp, bool blank);
 
 void min_set_viewport(struct hubp *hubp,
                const struct rect *viewport,
-               const struct rect *viewport_c);
+               const struct rect *viewport_c,
+               enum dc_rotation_angle rotation);
+/* rotation angle added for use by hubp21_set_viewport */
 
 void hubp1_clk_cntl(struct hubp *hubp, bool enable);
 void hubp1_vtg_sel(struct hubp *hubp, uint32_t otg_inst);

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index 2b3081ee0e07c54f4ad0ba81f8abfc314eaa7f6d..2440e28493e709164f50999288fd5f46a1060dd3 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -2286,7 +2286,8 @@ static void dcn10_update_dchubp_dpp(
                hubp->funcs->mem_program_viewport(
                        hubp,
                        &pipe_ctx->plane_res.scl_data.viewport,
-                       &pipe_ctx->plane_res.scl_data.viewport_c);
+                       &pipe_ctx->plane_res.scl_data.viewport_c,
+                       plane_state->rotation);
        }
 
        if (pipe_ctx->stream->cursor_attributes.address.quad_part != 0) {

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
index 619af3b3029ddb5623f2905d98cb4b819fa045d2..392542f84ca2c2f0e9a0ade309f6ff7210f9d6bd 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
@@ -1382,7 +1382,8 @@ static void dcn20_update_dchubp_dpp(
                hubp->funcs->mem_program_viewport(
                        hubp,
                        &pipe_ctx->plane_res.scl_data.viewport,
-                       &pipe_ctx->plane_res.scl_data.viewport_c);
+                       &pipe_ctx->plane_res.scl_data.viewport_c,
+                       plane_state->rotation);
 
        /* Any updates are handled in dc interface, just need to apply existing for plane enable */
        if ((pipe_ctx->update_flags.bits.enable || pipe_ctx->update_flags.bits.opp_changed)

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 4408aed5087b2c25fe404cc8f65f7ec60e1615af..38661b9c61f80439e3e7036112f84a5102edd32f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c
@@ -169,7 +169,8 @@ static void hubp21_setup(
 void hubp21_set_viewport(
        struct hubp *hubp,
        const struct rect *viewport,
-       const struct rect *viewport_c)
+       const struct rect *viewport_c,
+       enum dc_rotation_angle rotation)
 {
        struct dcn21_hubp *hubp21 = TO_DCN21_HUBP(hubp);
        int patched_viewport_height = 0;
@@ -196,9 +197,11 @@ void hubp21_set_viewport(
         *      Work around for underflow issue with NV12 + rIOMMU translation
         *      + immediate flip. This will cause hubp underflow, but will not
         *      be user visible since underflow is in blank region
+        *      Disable w/a when rotated 180 degrees, causes vertical chroma offset
         */
        patched_viewport_height = viewport_c->height;
-       if (viewport_c->height != 0 && debug->nv12_iflip_vm_wa) {
+       if (viewport_c->height != 0 && debug->nv12_iflip_vm_wa &&
+                       rotation != ROTATION_ANGLE_180) {
                int pte_row_height = 0;
                int pte_rows = 0;
 

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h b/drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
index 9793da0f3c7ef8d20426aa3bb92ba1f949a3ffee..85a34dde8526427cc95b76b791b7ba9634607fbd 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
@@ -82,7 +82,9 @@ struct hubp_funcs {
        void (*mem_program_viewport)(
                        struct hubp *hubp,
                        const struct rect *viewport,
-                       const struct rect *viewport_c);
+                       const struct rect *viewport_c,
+                       enum dc_rotation_angle rotation);
+                       /* rotation needed for Renoir workaround */
 
        bool (*hubp_program_surface_flip_and_addr)(
                struct hubp *hubp,