Skip to content

Commit c33a932

Browse files
Chris Parkalexdeucher
authored andcommitted
drm/amd/display: Ignore scalar validation failure if pipe is phantom
[Why] There are some pipe scaler validation failure when the pipe is phantom and causes crash in DML validation. Since, scalar parameters are not as important in phantom pipe and we require this plane to do successful MCLK switches, the failure condition can be ignored. [How] Ignore scalar validation failure if the pipe validation is marked as phantom pipe. Cc: [email protected] # 6.11+ Reviewed-by: Dillon Varone <[email protected]> Signed-off-by: Chris Park <[email protected]> Signed-off-by: Hamza Mahfooz <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 8fef253 commit c33a932

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,6 +1501,10 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)
15011501
res = spl_calculate_scaler_params(spl_in, spl_out);
15021502
// Convert respective out params from SPL to scaler data
15031503
translate_SPL_out_params_to_pipe_ctx(pipe_ctx, spl_out);
1504+
1505+
/* Ignore scaler failure if pipe context plane is phantom plane */
1506+
if (!res && plane_state->is_phantom)
1507+
res = true;
15041508
} else {
15051509
#endif
15061510
/* depends on h_active */
@@ -1571,6 +1575,10 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)
15711575
&plane_state->scaling_quality);
15721576
}
15731577

1578+
/* Ignore scaler failure if pipe context plane is phantom plane */
1579+
if (!res && plane_state->is_phantom)
1580+
res = true;
1581+
15741582
if (res && (pipe_ctx->plane_res.scl_data.taps.v_taps != temp.v_taps ||
15751583
pipe_ctx->plane_res.scl_data.taps.h_taps != temp.h_taps ||
15761584
pipe_ctx->plane_res.scl_data.taps.v_taps_c != temp.v_taps_c ||

0 commit comments

Comments
 (0)