Skip to content

Commit 6ee8784

Browse files
Chris Parkmehmetb0
authored andcommitted
drm/amd/display: Ignore scalar validation failure if pipe is phantom
BugLink: https://bugs.launchpad.net/bugs/2096827 [ Upstream commit c33a932 ] [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]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Koichiro Den <[email protected]>
1 parent 7bec187 commit 6ee8784

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
@@ -1508,6 +1508,10 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)
15081508
res = spl_calculate_scaler_params(spl_in, spl_out);
15091509
// Convert respective out params from SPL to scaler data
15101510
translate_SPL_out_params_to_pipe_ctx(pipe_ctx, spl_out);
1511+
1512+
/* Ignore scaler failure if pipe context plane is phantom plane */
1513+
if (!res && plane_state->is_phantom)
1514+
res = true;
15111515
} else {
15121516
#endif
15131517
/* depends on h_active */
@@ -1578,6 +1582,10 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)
15781582
&plane_state->scaling_quality);
15791583
}
15801584

1585+
/* Ignore scaler failure if pipe context plane is phantom plane */
1586+
if (!res && plane_state->is_phantom)
1587+
res = true;
1588+
15811589
if (res && (pipe_ctx->plane_res.scl_data.taps.v_taps != temp.v_taps ||
15821590
pipe_ctx->plane_res.scl_data.taps.h_taps != temp.h_taps ||
15831591
pipe_ctx->plane_res.scl_data.taps.v_taps_c != temp.v_taps_c ||

0 commit comments

Comments
 (0)