drm/amd/display: Add null check to dml21_find_dc_pipes_for_plane

When a phantom stream is in the process of being deconstructed, there
could be pipes with no associated planes.  In that case, ignore the
phantom stream entirely when searching for associated pipes.

Cc: stable@vger.kernel.org
Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
Acked-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: Dillon Varone <dillon.varone@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.c
index 4e12810308a42d4ca02b4ffabd39c8ff94993e0a..4166332b5b89911097c72769561de4478324d92f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.c
@@ -126,10 +126,15 @@ int dml21_find_dc_pipes_for_plane(const struct dc *in_dc,
        if (dc_phantom_stream && num_pipes > 0) {
                dc_phantom_stream_status = dml_ctx->config.callbacks.get_stream_status(context, dc_phantom_stream);
 
-               /* phantom plane will have same index as main */
-               dc_phantom_plane = dc_phantom_stream_status->plane_states[dc_plane_index];
+               if (dc_phantom_stream_status) {
+                       /* phantom plane will have same index as main */
+                       dc_phantom_plane = dc_phantom_stream_status->plane_states[dc_plane_index];
 
-               dml_ctx->config.callbacks.get_dpp_pipes_for_plane(dc_phantom_plane, &context->res_ctx, dc_phantom_pipes);
+                       if (dc_phantom_plane) {
+                               /* only care about phantom pipes if they contain the phantom plane */
+                               dml_ctx->config.callbacks.get_dpp_pipes_for_plane(dc_phantom_plane, &context->res_ctx, dc_phantom_pipes);
+                       }
+               }
        }
 
        return num_pipes;