diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2023-02-25 03:15:41 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-20 02:29:21 +0300 |
| commit | 0992884d09cc1c91e9c3310a9204eb080db37714 (patch) | |
| tree | eaaa6b190c029b7dcb87d34cceb9ac9799893859 /drivers/gpu/drm | |
| parent | 226bfec858c93797dbd3d47d1418ed68684fa752 (diff) | |
| download | linux-0992884d09cc1c91e9c3310a9204eb080db37714.tar.xz | |
drm/xe: Remove dependency on intel_lrc_reg.h
Create regs/xe_lrc_layout.h file with all the offsets used by the xe
driver. Eventually the xe driver may use a different way to define them
since it doesn't supported below gen12.
v2: Rename file to intel_lrc_layout.h since it's not really about
registers (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>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/xe/regs/xe_lrc_layout.h | 17 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_execlist.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_submit.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_lrc.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_ring_ops.c | 2 |
5 files changed, 21 insertions, 5 deletions
diff --git a/drivers/gpu/drm/xe/regs/xe_lrc_layout.h b/drivers/gpu/drm/xe/regs/xe_lrc_layout.h new file mode 100644 index 000000000000..4be81abc86ad --- /dev/null +++ b/drivers/gpu/drm/xe/regs/xe_lrc_layout.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright © 2023 Intel Corporation + */ + +#ifndef _XE_LRC_LAYOUT_H_ +#define _XE_LRC_LAYOUT_H_ + +#define CTX_CONTEXT_CONTROL (0x02 + 1) +#define CTX_RING_HEAD (0x04 + 1) +#define CTX_RING_TAIL (0x06 + 1) +#define CTX_RING_START (0x08 + 1) +#define CTX_RING_CTL (0x0a + 1) +#define CTX_PDP0_UDW (0x30 + 1) +#define CTX_PDP0_LDW (0x32 + 1) + +#endif diff --git a/drivers/gpu/drm/xe/xe_execlist.c b/drivers/gpu/drm/xe/xe_execlist.c index fe20c6128134..d788a6e894a6 100644 --- a/drivers/gpu/drm/xe/xe_execlist.c +++ b/drivers/gpu/drm/xe/xe_execlist.c @@ -9,6 +9,7 @@ #include "regs/xe_engine_regs.h" #include "regs/xe_gt_regs.h" +#include "regs/xe_lrc_layout.h" #include "xe_bo.h" #include "xe_device.h" #include "xe_engine.h" @@ -22,7 +23,6 @@ #include "xe_sched_job.h" #include "gt/intel_gpu_commands.h" -#include "gt/intel_lrc_reg.h" #include "i915_reg.h" #define XE_EXECLIST_HANG_LIMIT 1 diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index 6469d3cd3beb..aa21f2bb5cba 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -13,6 +13,7 @@ #include <drm/drm_managed.h> +#include "regs/xe_lrc_layout.h" #include "xe_device.h" #include "xe_engine.h" #include "xe_force_wake.h" @@ -32,8 +33,6 @@ #include "xe_trace.h" #include "xe_vm.h" -#include "gt/intel_lrc_reg.h" - static struct xe_gt * guc_to_gt(struct xe_guc *guc) { diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c index bf12f71fbe72..5baa3cf53852 100644 --- a/drivers/gpu/drm/xe/xe_lrc.c +++ b/drivers/gpu/drm/xe/xe_lrc.c @@ -7,6 +7,7 @@ #include "regs/xe_engine_regs.h" #include "regs/xe_gt_regs.h" +#include "regs/xe_lrc_layout.h" #include "xe_bo.h" #include "xe_device.h" #include "xe_engine_types.h" @@ -16,7 +17,6 @@ #include "xe_vm.h" #include "gt/intel_gpu_commands.h" -#include "gt/intel_lrc_reg.h" #include "i915_reg.h" #define GEN8_CTX_VALID (1 << 0) diff --git a/drivers/gpu/drm/xe/xe_ring_ops.c b/drivers/gpu/drm/xe/xe_ring_ops.c index 1b633222fda6..6275f8c34878 100644 --- a/drivers/gpu/drm/xe/xe_ring_ops.c +++ b/drivers/gpu/drm/xe/xe_ring_ops.c @@ -6,6 +6,7 @@ #include "xe_ring_ops.h" #include "regs/xe_gt_regs.h" +#include "regs/xe_lrc_layout.h" #include "xe_engine_types.h" #include "xe_gt.h" #include "xe_lrc.h" @@ -14,7 +15,6 @@ #include "xe_vm_types.h" #include "gt/intel_gpu_commands.h" -#include "gt/intel_lrc_reg.h" #include "i915_reg.h" static u32 preparser_disable(bool state) |