diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2023-02-25 23:10:39 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-20 02:29:23 +0300 |
| commit | 8cb49012ac171698b1253dea45e56c284e997d38 (patch) | |
| tree | 490bb5be1accff65c22afbe8dc311a7be5e4a955 /drivers/gpu/drm/xe/xe_device.c | |
| parent | 3457388fcd145d64e6852ca60084e822bec81e9f (diff) | |
| download | linux-8cb49012ac171698b1253dea45e56c284e997d38.tar.xz | |
drm/xe: Do not spread i915_reg_defs.h include
Reduce the use of i915_reg_defs.h so it can be encapsulated in a single
place.
1) If it was being included by mistake, remove
2) If it was included for FIELD_GET()/FIELD_PREP()/GENMASK() and the
like, just include <linux/bitfield.h>
3) If it was included to be able to define additional registers, move
the registers to the relavant headers (regs/xe_regs.h or
regs/xe_gt_regs.h)
v2:
- Squash commit fixing i915_reg_defs.h include and with the one
introducing regs/xe_reg_defs.h
- Remove more cases of i915_reg_defs.h being used when all it was
needed was linux/bitfield.h (Matt Roper)
- Move some registers to the corresponding regs/*.h file (Matt Roper)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
[Rodrigo squashed here the removal of the i915 include]
Diffstat (limited to 'drivers/gpu/drm/xe/xe_device.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_device.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 6d7d57d08a99..00e8ed235353 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -12,6 +12,7 @@ #include <drm/drm_managed.h> #include <drm/xe_drm.h> +#include "regs/xe_regs.h" #include "xe_bo.h" #include "xe_debugfs.h" #include "xe_dma_buf.h" @@ -335,8 +336,6 @@ static void device_kill_persitent_engines(struct xe_device *xe, mutex_unlock(&xe->persitent_engines.lock); } -#define SOFTWARE_FLAGS_SPR33 _MMIO(0x4F084) - void xe_device_wmb(struct xe_device *xe) { struct xe_gt *gt = xe_device_get_gt(xe, 0); |