diff options
| author | Michal Wajdeczko <michal.wajdeczko@intel.com> | 2024-05-30 16:35:24 +0300 |
|---|---|---|
| committer | Michal Wajdeczko <michal.wajdeczko@intel.com> | 2024-05-31 00:50:25 +0300 |
| commit | 2d8865b27724117022a67984e4a6ef94c9555ec7 (patch) | |
| tree | 9b047d185a875f8a740bfd91fe26de9f4f0c45fa | |
| parent | 2adfc4e022f397913a23756a08fbfca3c4ee9c8b (diff) | |
| download | linux-2d8865b27724117022a67984e4a6ef94c9555ec7.tar.xz | |
drm/xe: Move BAR definitions to dedicated file
We should keep all hardware definitions separated from the driver
code. Move LMEM_BAR definition to new regs/xe_bars.h file and also
add there GTTMMADR_BAR definition to avoid using magic 0 resource.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240530133527.1328-3-michal.wajdeczko@intel.com
| -rw-r--r-- | drivers/gpu/drm/xe/regs/xe_bars.h | 11 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_mmio.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_mmio.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 1 |
4 files changed, 14 insertions, 3 deletions
diff --git a/drivers/gpu/drm/xe/regs/xe_bars.h b/drivers/gpu/drm/xe/regs/xe_bars.h new file mode 100644 index 000000000000..ce05b6ae832f --- /dev/null +++ b/drivers/gpu/drm/xe/regs/xe_bars.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright © 2024 Intel Corporation + */ +#ifndef _XE_BARS_H_ +#define _XE_BARS_H_ + +#define GTTMMADR_BAR 0 /* MMIO + GTT */ +#define LMEM_BAR 2 /* VRAM */ + +#endif diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index 44bff104c011..1272246dd8a3 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -12,6 +12,7 @@ #include <drm/drm_managed.h> #include <drm/xe_drm.h> +#include "regs/xe_bars.h" #include "regs/xe_engine_regs.h" #include "regs/xe_gt_regs.h" #include "regs/xe_regs.h" @@ -435,7 +436,7 @@ int xe_mmio_init(struct xe_device *xe) * registers (0-4MB), reserved space (4MB-8MB) and GGTT (8MB-16MB). */ xe->mmio.size = pci_resource_len(pdev, mmio_bar); - xe->mmio.regs = pci_iomap(pdev, mmio_bar, 0); + xe->mmio.regs = pci_iomap(pdev, mmio_bar, GTTMMADR_BAR); if (xe->mmio.regs == NULL) { drm_err(&xe->drm, "failed to map registers\n"); return -EIO; diff --git a/drivers/gpu/drm/xe/xe_mmio.h b/drivers/gpu/drm/xe/xe_mmio.h index 1d578fd6ffc2..6ae0cc32c651 100644 --- a/drivers/gpu/drm/xe/xe_mmio.h +++ b/drivers/gpu/drm/xe/xe_mmio.h @@ -11,8 +11,6 @@ struct xe_device; struct xe_reg; -#define LMEM_BAR 2 - int xe_mmio_init(struct xe_device *xe); int xe_mmio_probe_tiles(struct xe_device *xe); diff --git a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c index 64592a8e527b..f46fd2df84de 100644 --- a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c +++ b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c @@ -13,6 +13,7 @@ #include <generated/xe_wa_oob.h> +#include "regs/xe_bars.h" #include "regs/xe_gt_regs.h" #include "regs/xe_regs.h" #include "xe_bo.h" |