Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46022C0018C for ; Sun, 13 Dec 2020 22:53:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AA1FC2220F for ; Sun, 13 Dec 2020 22:53:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA1FC2220F Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=moreofthesa.me.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BAC4B89DEA; Sun, 13 Dec 2020 22:53:28 +0000 (UTC) Received: from spam.moreofthesa.me.uk (moreofthesa.me.uk [IPv6:2001:8b0:897:1651::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 231B789DE5 for ; Sun, 13 Dec 2020 22:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=moreofthesa.me.uk; s=201708; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=vNFdkkV2NUiVeraKS20j3KMlugbZnspCvkOBtCqHd/E=; b=syVP/lzTNlQWEOXhkNvFpeJdV/ c2nXDZV/dO3t2Qdp3omffcz7MmFWMe2LCtVQ52wEhlVW6E7Y2HSB6iO2tiC9PsZ+jviUz9rvsS+AO o4IO94vEBW+/eFK7jjF+hC9xLNssLrlngm/+MGprRBlYztlaXpn2Jy5OA3HDLjboiVWGcjLE7IRTm Xuz8X0OT67zetA8FCVjw9c0g4aVBK6uHf8miaR5GUD/hK/D7qDB9OAG80Kx1cFWwF7RxcYSo5P8Jd ZRPUEAHGCjlsEO7PZxV+rYVVUyJnL6DkCU760DYBBDEEYacHG3GfKJfqFs6VHF8GP0eK8MgThOZZy iOTf6beA==; Received: from [2001:8b0:897:1650::2] (helo=flibble.moreofthesa.me.uk) by spam.moreofthesa.me.uk with esmtp (Exim 4.92) (envelope-from ) id 1koaF2-0004Qu-2R; Sun, 13 Dec 2020 22:53:24 +0000 From: Darren Salt To: amd-gfx@lists.freedesktop.org Subject: [PATCH 3/8] amdgpu: resize BAR0 to the maximum available size, even if it doesn't cover VRAM (v4) Date: Sun, 13 Dec 2020 22:53:18 +0000 Message-Id: <20201213225323.6752-4-devspam@moreofthesa.me.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201213225323.6752-1-devspam@moreofthesa.me.uk> References: <20201213225323.6752-1-devspam@moreofthesa.me.uk> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:897:1650::2 X-SA-Exim-Mail-From: devspam@moreofthesa.me.uk X-SA-Exim-Scanned: No (on spam.moreofthesa.me.uk); SAEximRunCond expanded to false X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Darren Salt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" This allows BAR0 resizing to be done for cards which don't advertise support for a size large enough to cover the VRAM but which do advertise at least one size larger than the default. For example, my RX 5600 XT, which advertises 256MB, 512MB and 1GB. [v4] use bit ops to find sizes to try [v3] don't use pci_rebar_get_current_size() [v2] rewritten to use PCI helper functions; some extra log text. Signed-off-by: Darren Salt --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 ++++++++++++++++++---- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 1595b124c145..b0f8ad603147 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -908,23 +908,29 @@ void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb) */ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev) { - u64 space_needed = roundup_pow_of_two(adev->gmc.real_vram_size); - u32 rbar_size = order_base_2(((space_needed >> 20) | 1)) - 1; + int rbar_size, current_size; + u64 current_bytes; + u32 available_sizes; struct pci_bus *root; struct resource *res; unsigned i; u16 cmd; int r; + bool nospc = false; /* Bypass for VF */ if (amdgpu_sriov_vf(adev)) return 0; - /* skip if the bios has already enabled large BAR */ - if (adev->gmc.real_vram_size && - (pci_resource_len(adev->pdev, 0) >= adev->gmc.real_vram_size)) + current_bytes = pci_resource_len(adev->pdev, 0); + + /* Skip if the BIOS has already enabled large BAR, covering the VRAM */ + if (current_bytes >= adev->gmc.real_vram_size) return 0; + current_size = current_bytes ? pci_rebar_bytes_to_size(current_bytes) : -1; + rbar_size = pci_rebar_bytes_to_size(adev->gmc.real_vram_size); + /* Check if the root BUS has 64bit memory resources */ root = adev->pdev->bus; while (root->parent) @@ -940,6 +946,18 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev) if (!res) return 0; + available_sizes = pci_rebar_get_possible_sizes(adev->pdev, 0); + if (available_sizes == 0) + return 0; + + /* Find the bit pos representing the smallest size covering the VRAM. + * Otherwise find the bit pos representing the largest available size. + * rbar_size may be smaller but should be unchanged. + */ + rbar_size = (ffs(available_sizes & (-1 << rbar_size)) ? : fls(available_sizes)) - 1; + if (rbar_size < 0) + return 0; /* can't happen */ + /* Disable memory decoding while we change the BAR addresses and size */ pci_read_config_word(adev->pdev, PCI_COMMAND, &cmd); pci_write_config_word(adev->pdev, PCI_COMMAND, @@ -952,11 +970,27 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev) pci_release_resource(adev->pdev, 0); - r = pci_resize_resource(adev->pdev, 0, rbar_size); - if (r == -ENOSPC) - DRM_INFO("Not enough PCI address space for a large BAR."); - else if (r && r != -ENOTSUPP) - DRM_ERROR("Problem resizing BAR0 (%d).", r); + for (; + rbar_size >= 0 && rbar_size > current_size; + rbar_size = fls(available_sizes & ~(-1 << rbar_size)) - 1 + ) { + r = pci_resize_resource(adev->pdev, 0, rbar_size); + if (r == 0) { + break; + } else if (r == -ENOTSUPP) { + dev_info(adev->dev, "BAR resizing not supported."); + break; + } else if (r == -ENOSPC) { + if (!nospc) { + /* Warn only the first time */ + dev_info(adev->dev, "Not enough PCI address space for a large BAR."); + nospc = true; + } + } else { + dev_err(adev->dev, "Problem resizing BAR0 (%d).", r); + break; + } + } pci_assign_unassigned_bus_resources(adev->pdev->bus); -- 2.20.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx