drm/amd/display: Flip pending check timeout due to disabled hubp

[Why]
When pipe locks are being taken we wait for flip pending to clear first.
In some cases the pipe mapping is changed and the pending we're checking
for will never clear.

[How]
Don't check disabled pipes for flip pending.

Signed-off-by: Aric Cyr <aric.cyr@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@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 cedf359a00f5cba273e75519ec67ad8e9e46b2e2..db5615a51fea848e3668abab920d1097c50123f9 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
@@ -734,6 +734,9 @@ bool hubp1_is_flip_pending(struct hubp *hubp)
        struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
        struct dc_plane_address earliest_inuse_address;
 
+       if (hubp && hubp->power_gated)
+               return false;
+
        REG_GET(DCSURF_FLIP_CONTROL,
                        SURFACE_FLIP_PENDING, &flip_pending);
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c
index bb920d0e0b892e7d5cc52fba20b0fff0d661b8a0..368818d2dfc6383f5da2763381e5d234dbbc4385 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c
@@ -908,6 +908,9 @@ bool hubp2_is_flip_pending(struct hubp *hubp)
        struct dcn20_hubp *hubp2 = TO_DCN20_HUBP(hubp);
        struct dc_plane_address earliest_inuse_address;
 
+       if (hubp && hubp->power_gated)
+               return false;
+
        REG_GET(DCSURF_FLIP_CONTROL,
                        SURFACE_FLIP_PENDING, &flip_pending);