drm/amd/display: Use |= when assigning wm_optimized_required

[Description]
Use |= when assigning to wm_optimized required because
we don't want to overwrite the flag in case the optimize
did not happen yet

Reviewed-by: Aric Cyr <Aric.Cyr@amd.com>
Acked-by: Alan Liu <HaoPing.Liu@amd.com>
Signed-off-by: Alvin Lee <Alvin.Lee2@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 6bfa16d9135fe4c91d7f9990ded1e86e92920af8..e5919ade8d0d59b6b3a89e5a6fde7a0446ec0e4f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
@@ -2023,8 +2023,11 @@ void dcn20_prepare_bandwidth(
                }
        }
 
-       /* program dchubbub watermarks */
-       dc->wm_optimized_required = hubbub->funcs->program_watermarks(hubbub,
+       /* program dchubbub watermarks:
+        * For assigning wm_optimized_required, use |= operator since we don't want
+        * to clear the value if the optimize has not happened yet
+        */
+       dc->wm_optimized_required |= hubbub->funcs->program_watermarks(hubbub,
                                        &context->bw_ctx.bw.dcn.watermarks,
                                        dc->res_pool->ref_clocks.dchub_ref_clock_inKhz / 1000,
                                        false);