From nobody Sun Feb 8 02:21:18 2026 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 56757174977; Wed, 27 Mar 2024 12:22:31 +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=1711542152; cv=none; b=t3ybA1ETg2CQCKez2zs8sVKdmfakuHEajNPOHfmICy9ZncEsLpVLFy+m636NXrRvKGSv3ixOoBYt22XYHCnQQLaB332pCJuVGHXifwwP4t/o+/KoohjSDikYoRKuJ4goDoL+nNoVu0oBHbqTEDw9wbCbKyI9fHw2hbQcpUMd1MA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711542152; c=relaxed/simple; bh=OK+2Jyhl3Tn8LDE1CvM7vRsE6lxOEeTzYbG/u6VlYPU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=C5jflHAF/waPsmI86xMZEAU0H0jb1OM9NzM5tJaeVPPIfvmDSsLzmQWF5gSMPkDq90hMTB3KBV7fxKbOF4Qya+KWWGp4XmD87sUXf2TFsLjDvZ+/a8rInOzkcLgLZHQETMIjInmtX4g6uC3P2FcYDJ7akvzeVf3sCYNaiScmj3Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H1rMvDVb; 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="H1rMvDVb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC67CC433F1; Wed, 27 Mar 2024 12:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711542150; bh=OK+2Jyhl3Tn8LDE1CvM7vRsE6lxOEeTzYbG/u6VlYPU=; h=From:To:Cc:Subject:Date:From; b=H1rMvDVbEvy+DF3joM6zqSQ39hHJNPf+mk3ySTEwKYUQiZyMFA6dI+XLLxCWXFXZ1 sCzIds7hgSVgt4MVHEhPX9pXzMIElFd03DNeQWj2XPTHIcwK88VgUtKl+8JAO7Nl4S Jj9yiefHdWpK0eJu1+AMvvuc63R1fVPVCQA327BLaxznqtVHhFGyEkP4oXHmdXi6mj 1oRWLnCngs4c69Af7FANUrW19B/GLUPHmVycgK5nZUPsFwAawm/8N+bSlGSvDw0JMN i2KRBUdbjPd4PJSWxgld70LDRmAPPwfuEUHx38jObzKuaHnsGY5rM4wehs8MJcf4HG pUMitl/YdtxUQ== From: Sasha Levin To: stable@vger.kernel.org, srinivasan.shanmugam@amd.com Cc: Alex Hung , Aurabindo Pillai , Rodrigo Siqueira , Hamza Mahfooz , Alex Deucher , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: FAILED: Patch "drm/amd/display: Drop 'acrtc' and add 'new_crtc_state' NULL check for writeback requests." failed to apply to 5.4-stable tree Date: Wed, 27 Mar 2024 08:22:28 -0400 Message-ID: <20240327122229.2837747-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.4-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 Reviewed-by: Alex Hung ------------------ original commit in Linus's tree ------------------ From b2f26f49e84bea03dddb5f37ff137c97b165107b Mon Sep 17 00:00:00 2001 From: Srinivasan Shanmugam Date: Sat, 13 Jan 2024 14:32:27 +0530 Subject: [PATCH] drm/amd/display: Drop 'acrtc' and add 'new_crtc_state' NULL check for writeback requests. Return value of 'to_amdgpu_crtc' which is container_of(...) can't be null, so it's null check 'acrtc' is dropped. Fixing the below: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9302 amdgpu_dm_= atomic_commit_tail() error: we previously assumed 'acrtc' could be null (se= e line 9299) Added 'new_crtc_state' NULL check for function 'drm_atomic_get_new_crtc_state' that retrieves the new state for a CRTC, while enabling writeback requests. Cc: stable@vger.kernel.org Cc: Alex Hung Cc: Aurabindo Pillai Cc: Rodrigo Siqueira Cc: Hamza Mahfooz Signed-off-by: Srinivasan Shanmugam Reviewed-by: Alex Hung Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 36af104e7663c..8623722e954f9 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -9327,10 +9327,10 @@ static void amdgpu_dm_atomic_commit_tail(struct drm= _atomic_state *state) if (!new_con_state->writeback_job) continue; =20 - new_crtc_state =3D NULL; + new_crtc_state =3D drm_atomic_get_new_crtc_state(state, &acrtc->base); =20 - if (acrtc) - new_crtc_state =3D drm_atomic_get_new_crtc_state(state, &acrtc->base); + if (!new_crtc_state) + continue; =20 if (acrtc->wb_enabled) continue; --=20 2.43.0