From nobody Sun May 12 02:16:35 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0058158A25; Wed, 27 Mar 2024 12:17:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541828; cv=none; b=X5ATHvHc5eFByGFhZ5l6Qc20R8qG8FfWFVHqbHhpjFFD+nXKd5GnTEXqPOdPouTWXBAgxoKDTrwvuK9zv421yaK+8Vm9SjKJ6oahsk7dj14FWk/tEFjJCJOUQ/5TO37rkLBJFykrfZO2QXAt5twkWpDqFLjQhwwNqcgP9fTGEIY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541828; c=relaxed/simple; bh=kenEp3bLE6jkSE3szxHnrn3xOLbb0Pcg/gufOkXJQ5E=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=vF0abvZT7HR7hlY6sGKrwBEz3EqdXG/bzgyl40ObA1sd4o87t98qSBbLRfN8axh3eZu43R5Z4aNJF+4rLp68o0FnUxibdhM/i32mijfXYN0a0qLveuBO6SqCTVQF2ApatF+x9v4DlC/6VyA+Acqsu90rI6H4rHiZzjQvd46bKLY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rXcP89g5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rXcP89g5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FDE9C43390; Wed, 27 Mar 2024 12:17:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711541828; bh=kenEp3bLE6jkSE3szxHnrn3xOLbb0Pcg/gufOkXJQ5E=; h=From:To:Cc:Subject:Date:From; b=rXcP89g5V190v0z0jcXmYQ9HVn5Ddn1LVn9YtXKXa2gEadhB98TQqV6FI/v2s7ckx EwCPyc4UEx7D6qIszJeT8QGZ+EmYVIY6tDuCSTh5HQhfFMunw0YKjy7AfFQxueBnHA /As2SFK1kpRjxjBUMW/nLx12HHLkPc2aV+l/XB8qFpNJKIUV+wbVpDby6wi0tO2qHv RaMVDNxDukpF0MvZI8bdWw0X4BFaHM54EpOLaV/t0Joddp4hoQd5uEpn8eoW/fPzPV M7br/wR78b08EcMc2P9cz43NG4JutLO+7VTqAF5C/hqSKSncV+tFANgWJOnJnzZh6I YykTtgm0tVyHA== From: Sasha Levin To: stable@vger.kernel.org, charlene.liu@amd.com Cc: Mario Limonciello , Alex Deucher , Sung joon Kim , Alex Hung , Daniel Wheeler , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: FAILED: Patch "drm/amd/display: Add logging resource checks" failed to apply to 5.15-stable tree Date: Wed, 27 Mar 2024 08:17:06 -0400 Message-ID: <20240327121706.2833283-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha Acked-by: Alex Hung Reviewed-by: Sung joon Kim Tested-by: Daniel Wheeler ------------------ original commit in Linus's tree ------------------ From 012fe0674af0753e71424b638960adbfb7f3db5a Mon Sep 17 00:00:00 2001 From: Charlene Liu Date: Thu, 28 Dec 2023 13:19:33 -0500 Subject: [PATCH] drm/amd/display: Add logging resource checks [Why] When mapping resources, resources could be unavailable. Cc: Mario Limonciello Cc: Alex Deucher Cc: stable@vger.kernel.org Reviewed-by: Sung joon Kim Acked-by: Alex Hung Signed-off-by: Charlene Liu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/core/dc.c | 4 +++- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++++ drivers/gpu/drm/amd/display/dc/core/dc_state.c | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd= /display/dc/core/dc.c index 69e726630241d..aa7c02ba948e9 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -3522,7 +3522,7 @@ static void commit_planes_for_stream(struct dc *dc, top_pipe_to_program =3D resource_get_otg_master_for_stream( &context->res_ctx, stream); - + ASSERT(top_pipe_to_program !=3D NULL); for (i =3D 0; i < dc->res_pool->pipe_count; i++) { struct pipe_ctx *old_pipe =3D &dc->current_state->res_ctx.pipe_ctx[i]; =20 @@ -4345,6 +4345,8 @@ static bool should_commit_minimal_transition_for_wind= owed_mpo_odm(struct dc *dc, =20 cur_pipe =3D resource_get_otg_master_for_stream(&dc->current_state->res_c= tx, stream); new_pipe =3D resource_get_otg_master_for_stream(&context->res_ctx, stream= ); + if (!cur_pipe || !new_pipe) + return false; cur_is_odm_in_use =3D resource_get_odm_slice_count(cur_pipe) > 1; new_is_odm_in_use =3D resource_get_odm_slice_count(new_pipe) > 1; if (cur_is_odm_in_use =3D=3D new_is_odm_in_use) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gp= u/drm/amd/display/dc/core/dc_resource.c index f2abc1096ffb6..9fbdb09697fd5 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -2194,6 +2194,10 @@ void resource_log_pipe_topology_update(struct dc *dc= , struct dc_state *state) for (stream_idx =3D 0; stream_idx < state->stream_count; stream_idx++) { otg_master =3D resource_get_otg_master_for_stream( &state->res_ctx, state->streams[stream_idx]); + if (!otg_master || otg_master->stream_res.tg =3D=3D NULL) { + DC_LOG_DC("topology update: otg_master NULL stream_idx %d!\n", stream_i= dx); + return; + } slice_count =3D resource_get_opp_heads_for_otg_master(otg_master, &state->res_ctx, opp_heads); for (slice_idx =3D 0; slice_idx < slice_count; slice_idx++) { diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_state.c b/drivers/gpu/d= rm/amd/display/dc/core/dc_state.c index 56feee0ff01b1..88c6436b28b69 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_state.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_state.c @@ -434,8 +434,9 @@ bool dc_state_add_plane( =20 otg_master_pipe =3D resource_get_otg_master_for_stream( &state->res_ctx, stream); - added =3D resource_append_dpp_pipes_for_plane_composition(state, - dc->current_state, pool, otg_master_pipe, plane_state); + if (otg_master_pipe) + added =3D resource_append_dpp_pipes_for_plane_composition(state, + dc->current_state, pool, otg_master_pipe, plane_state); =20 if (added) { stream_status->plane_states[stream_status->plane_count] =3D --=20 2.43.0