drm/amd/display: Add DC_VALIDATE_MODE_AND_PROGRAMMING condition check for force odm2:1

[Why & How]
Need to limit force ODM 2:1 to DC_VALIDATE_MODE_AND_PROGRAMMING only,
i.e. not block isCofunc check for topology mapping allowed.

Reviewed-by: Ovidiu Bunea <ovidiu.bunea@amd.com>
Signed-off-by: Charlene Liu <Charlene.Liu@amd.com>
Signed-off-by: Ray Wu <ray.wu@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/resource/dcn42/dcn42_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c
index efe025ca4ed3ece9f7a47eaa15263b0ef61a7de6..b9f998ea2d0faa67e0e3c9428d178ba43c3f7b0c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c
@@ -1725,8 +1725,10 @@ enum dc_status dcn42_validate_bandwidth(struct dc *dc,
        bool out = false;
 
        DC_FP_START();
-
-       dcn42_decide_odm_override(dc, context);
+       if (validate_mode == DC_VALIDATE_MODE_AND_PROGRAMMING) {
+               /*only do this when programing HW*/
+               dcn42_decide_odm_override(dc, context);
+       }
 
        out = dml2_validate(dc, context, context->bw_ctx.dml2,
                                                validate_mode);