[Intel-xe] [PATCH v4 07/12] drm/xe: Remove dependency on i915_reg.h

[Lucas De Marchi]

On Fri, Feb 24, 2023 at 04:32:22PM -0800, Matt Roper wrote:
>On Fri, Feb 24, 2023 at 04:15:43PM -0800, Lucas De Marchi wrote:
>> Copy the macros used by xe in i915_reg.h to regs/xe_regs.h. A minimal
>> cleanup is done while copying so they adhere minimally to the coding
>> style.  Further reordering and cleaning is left for later.
>>
>> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
>> ---
>>  drivers/gpu/drm/xe/regs/xe_regs.h      | 111 +++++++++++++++++++++++++
>>  drivers/gpu/drm/xe/xe_execlist.c       |   3 +-
>>  drivers/gpu/drm/xe/xe_ggtt.c           |   3 +-
>>  drivers/gpu/drm/xe/xe_gt_clock.c       |   3 +-
>>  drivers/gpu/drm/xe/xe_guc_pc.c         |   3 +-
>>  drivers/gpu/drm/xe/xe_hw_engine.c      |   3 +-
>>  drivers/gpu/drm/xe/xe_irq.c            |   3 +-
>>  drivers/gpu/drm/xe/xe_lrc.c            |   3 +-
>>  drivers/gpu/drm/xe/xe_mmio.c           |   3 +-
>>  drivers/gpu/drm/xe/xe_pci.c            |   3 +-
>>  drivers/gpu/drm/xe/xe_ring_ops.c       |   4 +-
>>  drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c |   3 +-
>>  drivers/gpu/drm/xe/xe_wa.c             |   3 +-
>>  13 files changed, 123 insertions(+), 25 deletions(-)
>>  create mode 100644 drivers/gpu/drm/xe/regs/xe_regs.h
>>
>> diff --git a/drivers/gpu/drm/xe/regs/xe_regs.h b/drivers/gpu/drm/xe/regs/xe_regs.h
>> new file mode 100644
>> index 000000000000..53f1ed54fb1c
>> --- /dev/null
>> +++ b/drivers/gpu/drm/xe/regs/xe_regs.h
>> @@ -0,0 +1,111 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright © 2023 Intel Corporation
>> + */
>> +#ifndef _XE_REGS_H_
>> +#define _XE_REGS_H_
>> +
>> +#include "i915_reg_defs.h"
>> +
>> +#define GU_CNTL					_MMIO(0x101010)
>> +#define   LMEM_INIT				REG_BIT(7)
>> +
>> +#define RENDER_RING_BASE			0x02000
>> +#define BSD_RING_BASE				0x04000
>> +#define GEN6_BSD_RING_BASE			0x12000
>> +#define GEN8_BSD2_RING_BASE			0x1c000
>
>The three BSD defines here (and VEBOX_RING_BASE below) should no longer
>be used as of f86cbd81daa9 ("drm/xe: Remove gen-based mmio offsets from
>hw engine init").  Not sure if you want to drop them now, or do that as
>part of the later cleanup; either way,

seems easy enough to squash while pushing with no risk of breaking
something

>
>Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

thanks

Lucas De Marchi