From nobody Sun May 12 02:44:43 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 347E515E7F1; Wed, 27 Mar 2024 12:18:56 +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=1711541937; cv=none; b=Aitp02Pz+VGAOeCDD4VJn7uNavGQnpdPEVlG8rqns+x36YRtrDPmlpGJ6kUEbIu7ZjynjEPOat5Q3ay01jmNZu2d12yzHzU/MgxYek55RxcY7eRTHMu4uAEG2KixrcvC4im1iRrqnq36AgXHAYq7xdlUxpGipZj4AcFoHzwrjRA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541937; c=relaxed/simple; bh=emGZeNA2xoB2QnM9tA5/+8/8f005SxZPXkGPrqiZcOk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=SLrv/r2T8NVmiJfi2kK1FDriclaOZ8uJ8aCdpzhTDqa7TXqyQ2evql41ZQJYxa1koSkejZ2NX964kGCMRiDDind1a+76xn0KnfEvGDNVPTZcxkg5Eb0oXBa+DNZ6W8Uc0DFOlVrYfCvb3FUzoailXGEqzpgAZXrw9XnMWO2BVLM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NSTeb6uv; 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="NSTeb6uv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC8FAC433F1; Wed, 27 Mar 2024 12:18:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711541936; bh=emGZeNA2xoB2QnM9tA5/+8/8f005SxZPXkGPrqiZcOk=; h=From:To:Cc:Subject:Date:From; b=NSTeb6uvYIss6iacJzBrlSgT6GuXw8n/8zmGnszlt5wGZpNhwfUQXpeg0M11g24Qf uRytK0koR8j/g4BgKnVVZj5LJBAqhFjwFuUffsYoo0AkS+KktXrSOgqoD/WrxWZyzD iamLNq37FQpMWSQUlc1GRh4d5Lef600zxm2OmT561TCFT14+S9YwKABe2tIfmYWKRm lt3gaznSd6B73spJBNrA/AuQDdMpv85fcJ4xF6hHc1EUOdy+7fBoDmu+ayKZhWMER2 PA07vS4c5jhHEqlY3MeChqjDGGBt45wiamMPuY86Zcw5DqkUrhl6YhzvQWsQjrJDuH cRsD75s5iHeDw== 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.10-stable tree Date: Wed, 27 Mar 2024 08:18:54 -0400 Message-ID: <20240327121854.2834775-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.10-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