From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 5DEE520B80B for ; Mon, 5 Oct 2026 08:07:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791187647; cv=none; b=QeKkOwydhwqNuz3HzfZf970hUgYV2yhxmkfL0lSsR6U7xhRNnjvpMdj282Y9BTZiKCj82Sp42FjW3t7MXs/pKnQPbMiVhaE8nQEYq7NFIvyUoEC10ndCINg2NXmHa8IcJI6F8j6uGxix4mgsY7B/ce11D0haySpArqKzl14leyQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791187647; c=relaxed/simple; bh=K71cxCGUX9H7j2Rpz3v8ylBh62CzUVxGsFq2L49Ta9w=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=ki8hqrf9hN1eI/R3tXR7z6NsnuX/ntn7JO/WeQ/QOa8sRwcIdbzGsLyLcKhuzRorcNI2cFXFl2VVfafi6qpIZzABQStS/+lMNlJnzONx5dMlS1XVoCoW036n/Tw+DW8UyvlCCoobskJeE+AdWzLNLghWfx4VWn725TtQTrOTqzk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PUApB+yu; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PUApB+yu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78F6D1F00893; Mon, 5 Oct 2026 08:07:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1791187646; bh=Go7wLckWsc8P3PmE3hSWA+f1onG6/0XHQoxQrFMHTgE=; h=Subject:To:Cc:From:Date; b=PUApB+yuM7WeL/Z9U1W91Ca0quj2rHVPdabNRuxzHCF8bs5xG646vuAbpcEQ3E5hZ bYi1GI+TzadL3yUqP96RtSk8jOVHJPJ0FKxMcNkM+xdlV6XhvgoeRKrrahp+D6X/Ut RtCEJT2HFo1BF7iBvyyAVIXGqVze65ueLl8gGIJg= Subject: FAILED: patch "[PATCH] drm/amd/display: Mark DCE 6.4 as not APU" failed to apply to 6.1-stable tree To: timur.kristof@gmail.com,alexander.deucher@amd.com,mario.limonciello@amd.com Cc: From: Date: Mon, 05 Oct 2026 10:07:15 +0200 Message-ID: <2026100515-geologic-shy-9328@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-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 . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 3a52d587d1fc8e8bf94ba1b07374f7ec91aaffb4 # git commit -s git send-email --to '' --in-reply-to '2026100515-geologic-shy-9328@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3a52d587d1fc8e8bf94ba1b07374f7ec91aaffb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Wed, 23 Sep 2026 14:20:33 +0200 Subject: [PATCH] drm/amd/display: Mark DCE 6.4 as not APU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DCE 6.4 is found in Oland chips, which were advertised as low-end gaming GPUs in 2013~2015 and then have been sold as low-end workstation GPUs until 2017~2019. These are not APUs. Fixes: 7c15fd86aaec ("drm/amd/display: dc/dce: add initial DCE6 support (v10)") Signed-off-by: Timur Kristóf Reviewed-by: Mario Limonciello Link: https://patch.msgid.link/20260923122033.1046651-3-timur.kristof@gmail.com Signed-off-by: Mario Limonciello Signed-off-by: Alex Deucher (cherry picked from commit 1072aa811ea1e61d5f763e4ec1bc6d24bb61f14a) Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c index 8612cc66a6ba..65c7dae3ff66 100644 --- a/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c +++ b/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c @@ -1341,7 +1341,6 @@ static bool dce64_construct( dc->caps.max_downscale_ratio = 200; dc->caps.i2c_speed_in_khz = 40; dc->caps.max_cursor_size = 64; - dc->caps.is_apu = true; dc->debug = debug_defaults; dc->check_config = config_defaults;