[PATCH 25/31] drm/amd/display: Remove assert for odm transition case

[Jasdeep Dhillon]

From: Eric Bernstein <eric.bernst...@amd.com>

Remove assert that will hit during odm transition case, since this is a
valid case.

Signed-off-by: Eric Bernstein <eric.bernst...@amd.com>
Reviewed-by: Rodrigo Siqueira <rodrigo.sique...@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c 
b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c
index 0b70247a5d36..f6d3da475835 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c
@@ -98,9 +98,13 @@ void dcn32_program_det_size(struct hubbub *hubbub, int 
hubp_inst, unsigned int d
        default:
                break;
        }
-       /* Should never be hit, if it is we have an erroneous hw config*/
-       ASSERT(hubbub2->det0_size + hubbub2->det1_size + hubbub2->det2_size
-                       + hubbub2->det3_size + hubbub2->compbuf_size_segments 
<= hubbub2->crb_size_segs);
+       if (hubbub2->det0_size + hubbub2->det1_size + hubbub2->det2_size
+                       + hubbub2->det3_size + hubbub2->compbuf_size_segments > 
hubbub2->crb_size_segs) {
+               /* This may happen during seamless transition from ODM 2:1 to 
ODM4:1 */
+               DC_LOG_WARNING("CRB Config Warning: DET size (%d,%d,%d,%d) + 
Compbuf size (%d) >  CRB segments (%d)\n",
+                                               hubbub2->det0_size, 
hubbub2->det1_size, hubbub2->det2_size, hubbub2->det3_size,
+                                               hubbub2->compbuf_size_segments, 
hubbub2->crb_size_segs);
+       }
 }
 
 static void dcn32_program_compbuf_size(struct hubbub *hubbub, unsigned int 
compbuf_size_kb, bool safe_to_increase)
-- 
2.25.1