From mboxrd@z Thu Jan 1 00:00:00 1970 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 BA14120AF99 for ; Tue, 4 Mar 2025 16:31:52 +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=1741105912; cv=none; b=GW9wSP+nFCWEBL4oSw/0jpNH3VqeopihDhOyB+wP/5YX6Q2yMZaCj4+jgP/gdSHzi1sE2GFGzyyZgV0T32HMJQ+S6fYI6xcwCiUObPvpvg3lzrQW6/FjY0QVarp/155SrZcOt7r1GhvJgs/Tp3W3yP4DDW8rN5lTaoU6VWiJ5Nk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741105912; c=relaxed/simple; bh=D5DaDBKruyo/DvGQswvsNmoKnoYXXxwJHuHXVkxH2SE=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=OKFjSwu1yaI3TcUnmKU/oBLsqF9ehn/7+PBb++PJ0EzxnP7IAM+LGq/OaN8h+34GadZ0DDf4K4jm5P4wPQ0ypwjPp9tnadmKVaT+l1X+6Xgd1Svidd9hKtN68ubGnLSutiNZp3nVq/9Pfk6yrm3w/pEJZYkp1AchEk+O3ipag5M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JTc0BO//; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="JTc0BO//" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0FEAC4CEE7; Tue, 4 Mar 2025 16:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741105912; bh=D5DaDBKruyo/DvGQswvsNmoKnoYXXxwJHuHXVkxH2SE=; h=Subject:To:Cc:From:Date:From; b=JTc0BO//PX1bR6mOu3wthzDxPKugWw73tuxV8yflX9fjH/Huf2Dm7vGSi6f0zEcHm Evy1yK5oYf19mhd6ib7GoctgnQ4LUxaq9MeaRBQHCkR8RbMFE19eWlRsfTJ6Ut9VB2 gtBALlVpEY3Xf03yQX72TmTZyF+Dgt9ATftfvf5s= Subject: FAILED: patch "[PATCH] drm/amdgpu: disable BAR resize on Dell G5 SE" failed to apply to 6.1-stable tree To: alexander.deucher@amd.com,lijo.lazar@amd.com Cc: From: Date: Tue, 04 Mar 2025 17:31:41 +0100 Message-ID: <2025030441-earthly-repulsive-42ea@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=ANSI_X3.4-1968 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 099bffc7cadff40bfab1517c3461c53a7a38a0d7 # git commit -s git send-email --to '' --in-reply-to '2025030441-earthly-repulsive-42ea@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 099bffc7cadff40bfab1517c3461c53a7a38a0d7 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 17 Feb 2025 10:55:05 -0500 Subject: [PATCH] drm/amdgpu: disable BAR resize on Dell G5 SE There was a quirk added to add a workaround for a Sapphire RX 5600 XT Pulse that didn't allow BAR resizing. However, the quirk caused a regression with runtime pm on Dell laptops using those chips, rather than narrowing the scope of the resizing quirk, add a quirk to prevent amdgpu from resizing the BAR on those Dell platforms unless runtime pm is disabled. v2: update commit message, add runpm check Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/1707 Fixes: 907830b0fc9e ("PCI: Add a REBAR size quirk for Sapphire RX 5600 XT Pulse") Reviewed-by: Lijo Lazar Signed-off-by: Alex Deucher (cherry picked from commit 5235053f443cef4210606e5fb71f99b915a9723d) Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index d100bb7a137c..018dfccd771b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1638,6 +1638,13 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev) if (amdgpu_sriov_vf(adev)) return 0; + /* resizing on Dell G5 SE platforms causes problems with runtime pm */ + if ((amdgpu_runtime_pm != 0) && + adev->pdev->vendor == PCI_VENDOR_ID_ATI && + adev->pdev->device == 0x731f && + adev->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL) + return 0; + /* PCI_EXT_CAP_ID_VNDR extended capability is located at 0x100 */ if (!pci_find_ext_capability(adev->pdev, PCI_EXT_CAP_ID_VNDR)) DRM_WARN("System can't access extended configuration space, please check!!\n");