diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2023-04-27 15:32:53 -0700 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-19 18:32:21 -0500 |
| commit | 3512a78a3cefcd9ec0177771f637de0fe4a64ea2 (patch) | |
| tree | 274f4114180aff907326184909eca50803f48563 /drivers/gpu/drm/xe/xe_wa.c | |
| parent | 36e22be498fb8361ef411ac7d8cf9404338f6fc2 (diff) | |
| download | lwn-3512a78a3cefcd9ec0177771f637de0fe4a64ea2.tar.gz lwn-3512a78a3cefcd9ec0177771f637de0fe4a64ea2.zip | |
drm/xe: Use XE_REG/XE_REG_MCR
These should replace the _MMIO() and MCR_REG() from i915, with the goal
of being more extensible, allowing to pass the additional fields for
struct xe_reg and struct xe_reg_mcr. Replace all uses of _MMIO() and
MCR_REG() in xe.
Since the RTP, reg-save-restore and WA infra are not ready to use the
new type, just undef the macro like was done for the i915 types
previously. That conversion will come later.
v2: Remove MEDIA_SOFT_SCRATCH_COUNT/MEDIA_SOFT_SCRATCH re-added by
mistake (Matt Roper)
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230427223256.1432787-8-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_wa.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_wa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c index 7a9bf588301e..ed3fa51ccd24 100644 --- a/drivers/gpu/drm/xe/xe_wa.c +++ b/drivers/gpu/drm/xe/xe_wa.c @@ -87,10 +87,10 @@ * a more declarative approach rather than procedural. */ -#undef _MMIO -#undef MCR_REG -#define _MMIO(x) _XE_RTP_REG(x) -#define MCR_REG(x) _XE_RTP_MCR_REG(x) +#undef XE_REG +#undef XE_REG_MCR +#define XE_REG(x, ...) _XE_RTP_REG(x) +#define XE_REG_MCR(x, ...) _XE_RTP_MCR_REG(x) __diag_push(); __diag_ignore_all("-Woverride-init", "Allow field overrides in table"); |