Skip to content

Commit 2987a64

Browse files
ij-intelbjorn-helgaas
authored andcommitted
drm/xe/vram: Use PCI rebar helpers in resize_vram_bar()
PCI core provides pci_rebar_size_supported() and pci_rebar_size_to_bytes(); use them in resize_vram_bar() to simplify code. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Christian König <christian.koenig@amd.com> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patch.msgid.link/20251113180053.27944-8-ilpo.jarvinen@linux.intel.com
1 parent c59038d commit 2987a64

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

drivers/gpu/drm/xe/xe_vram.c

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
#include "xe_vram.h"
2525
#include "xe_vram_types.h"
2626

27-
#define BAR_SIZE_SHIFT 20
28-
2927
static void
3028
_resize_bar(struct xe_device *xe, int resno, resource_size_t size)
3129
{
@@ -71,25 +69,22 @@ static void resize_vram_bar(struct xe_device *xe)
7169

7270
/* set to a specific size? */
7371
if (force_vram_bar_size) {
74-
u32 bar_size_bit;
75-
76-
rebar_size = force_vram_bar_size * (resource_size_t)SZ_1M;
72+
rebar_size = pci_rebar_bytes_to_size(force_vram_bar_size *
73+
(resource_size_t)SZ_1M);
7774

78-
bar_size_bit = bar_size_mask & BIT(pci_rebar_bytes_to_size(rebar_size));
79-
80-
if (!bar_size_bit) {
75+
if (!pci_rebar_size_supported(pdev, LMEM_BAR, rebar_size)) {
8176
drm_info(&xe->drm,
8277
"Requested size: %lluMiB is not supported by rebar sizes: 0x%x. Leaving default: %lluMiB\n",
83-
(u64)rebar_size >> 20, bar_size_mask, (u64)current_size >> 20);
78+
(u64)pci_rebar_size_to_bytes(rebar_size) >> 20,
79+
bar_size_mask, (u64)current_size >> 20);
8480
return;
8581
}
8682

87-
rebar_size = 1ULL << (__fls(bar_size_bit) + BAR_SIZE_SHIFT);
88-
83+
rebar_size = pci_rebar_size_to_bytes(rebar_size);
8984
if (rebar_size == current_size)
9085
return;
9186
} else {
92-
rebar_size = 1ULL << (__fls(bar_size_mask) + BAR_SIZE_SHIFT);
87+
rebar_size = pci_rebar_size_to_bytes(__fls(bar_size_mask));
9388

9489
/* only resize if larger than current */
9590
if (rebar_size <= current_size)

0 commit comments

Comments
 (0)