drm/amd/display: Compare mpcc_inst to mpcc_count instead of a constant
authorJoshua Aberback <joshua.aberback@amd.com>
Thu, 20 Aug 2020 04:57:22 +0000 (00:57 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 15 Sep 2020 21:52:40 +0000 (17:52 -0400)
[Why]
This assert triggers a false negative because there are more than 4 MPCCs
on many asics.

[How]
 - change assert comparisson
 - remove unused variable

Signed-off-by: Joshua Aberback <joshua.aberback@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c

index a5d750e..1390ff1 100644 (file)
@@ -220,15 +220,13 @@ static void dcn30_set_writeback(
                struct dc_writeback_info *wb_info,
                struct dc_state *context)
 {
-       struct dwbc *dwb;
        struct mcif_wb *mcif_wb;
        struct mcif_buf_params *mcif_buf_params;
 
        ASSERT(wb_info->dwb_pipe_inst < MAX_DWB_PIPES);
        ASSERT(wb_info->wb_enabled);
        ASSERT(wb_info->mpcc_inst >= 0);
-       ASSERT(wb_info->mpcc_inst < 4);
-       dwb = dc->res_pool->dwbc[wb_info->dwb_pipe_inst];
+       ASSERT(wb_info->mpcc_inst < dc->res_pool->mpcc_count);
        mcif_wb = dc->res_pool->mcif_wb[wb_info->dwb_pipe_inst];
        mcif_buf_params = &wb_info->mcif_buf_params;