diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2937-drm-amdgpu-require-a-root-bus-window-above-4GB-for-B.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2937-drm-amdgpu-require-a-root-bus-window-above-4GB-for-B.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2937-drm-amdgpu-require-a-root-bus-window-above-4GB-for-B.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2937-drm-amdgpu-require-a-root-bus-window-above-4GB-for-B.patch new file mode 100644 index 00000000..b819c02e --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2937-drm-amdgpu-require-a-root-bus-window-above-4GB-for-B.patch @@ -0,0 +1,56 @@ +From da3b2fd1c774f42245d1e24bec73e5e4ce7110de Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Wed, 15 Nov 2017 20:07:38 +0100 +Subject: [PATCH 2937/4131] drm/amdgpu: require a root bus window above 4GB for + BAR resize +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Don't even try to resize the BAR when there is no window above 4GB. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 39dcc4e..226e68b 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -739,6 +739,9 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev) + { + u64 space_needed = roundup_pow_of_two(adev->mc.real_vram_size); + u32 rbar_size = order_base_2(((space_needed >> 20) | 1)) - 1; ++ struct pci_bus *root; ++ struct resource *res; ++ unsigned i; + u16 cmd; + int r; + +@@ -746,6 +749,21 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev) + if (amdgpu_sriov_vf(adev)) + return 0; + ++ /* Check if the root BUS has 64bit memory resources */ ++ root = adev->pdev->bus; ++ while (root->parent) ++ root = root->parent; ++ ++ pci_bus_for_each_resource(root, res, i) { ++ if (res && res->flags & IORESOURCE_MEM_64 && ++ res->start > 0x100000000ull) ++ break; ++ } ++ ++ /* Trying to resize is pointless without a root hub window above 4GB */ ++ if (!res) ++ return 0; ++ + /* 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, +-- +2.7.4 + |