diff options
author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2018-07-30 23:02:13 -0400 |
---|---|---|
committer | Zhenyu Wang <zhenyuw@linux.intel.com> | 2018-08-06 22:40:11 -0400 |
commit | 69ca5af4ff9a3ff96e4595c2b7522c01a2641779 (patch) | |
tree | f8648abf75c22daf73ef9e039eeedc4778f6561c | |
parent | a752b070a67823174565322cc48b2668daf9a8da (diff) |
drm/i915/gvt: Move some MMIO definitions to reg.h
To consolidate all gvt private MMIO definition in one place,
this moves some not yet used in i915 to reg.h.
Reviewed-by: Hang Yuan <hang.yuan@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
-rw-r--r-- | drivers/gpu/drm/i915/gvt/mmio_context.c | 13 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/gvt/reg.h | 9 |
2 files changed, 9 insertions, 13 deletions
diff --git a/drivers/gpu/drm/i915/gvt/mmio_context.c b/drivers/gpu/drm/i915/gvt/mmio_context.c index 20be9a92600f..d20f2c9bda82 100644 --- a/drivers/gpu/drm/i915/gvt/mmio_context.c +++ b/drivers/gpu/drm/i915/gvt/mmio_context.c | |||
@@ -37,19 +37,6 @@ | |||
37 | #include "gvt.h" | 37 | #include "gvt.h" |
38 | #include "trace.h" | 38 | #include "trace.h" |
39 | 39 | ||
40 | /** | ||
41 | * Defined in Intel Open Source PRM. | ||
42 | * Ref: https://01.org/linuxgraphics/documentation/hardware-specification-prms | ||
43 | */ | ||
44 | #define TRVATTL3PTRDW(i) _MMIO(0x4de0 + (i)*4) | ||
45 | #define TRNULLDETCT _MMIO(0x4de8) | ||
46 | #define TRINVTILEDETCT _MMIO(0x4dec) | ||
47 | #define TRVADR _MMIO(0x4df0) | ||
48 | #define TRTTE _MMIO(0x4df4) | ||
49 | #define RING_EXCC(base) _MMIO((base) + 0x28) | ||
50 | #define RING_GFX_MODE(base) _MMIO((base) + 0x29c) | ||
51 | #define VF_GUARDBAND _MMIO(0x83a4) | ||
52 | |||
53 | #define GEN9_MOCS_SIZE 64 | 40 | #define GEN9_MOCS_SIZE 64 |
54 | 41 | ||
55 | /* Raw offset is appened to each line for convenience. */ | 42 | /* Raw offset is appened to each line for convenience. */ |
diff --git a/drivers/gpu/drm/i915/gvt/reg.h b/drivers/gpu/drm/i915/gvt/reg.h index d4f7ce6dc1d7..60dcc6bb8425 100644 --- a/drivers/gpu/drm/i915/gvt/reg.h +++ b/drivers/gpu/drm/i915/gvt/reg.h | |||
@@ -77,4 +77,13 @@ | |||
77 | #define _RING_CTL_BUF_SIZE(ctl) (((ctl) & RB_TAIL_SIZE_MASK) + \ | 77 | #define _RING_CTL_BUF_SIZE(ctl) (((ctl) & RB_TAIL_SIZE_MASK) + \ |
78 | I915_GTT_PAGE_SIZE) | 78 | I915_GTT_PAGE_SIZE) |
79 | 79 | ||
80 | #define TRVATTL3PTRDW(i) _MMIO(0x4de0 + (i) * 4) | ||
81 | #define TRNULLDETCT _MMIO(0x4de8) | ||
82 | #define TRINVTILEDETCT _MMIO(0x4dec) | ||
83 | #define TRVADR _MMIO(0x4df0) | ||
84 | #define TRTTE _MMIO(0x4df4) | ||
85 | #define RING_EXCC(base) _MMIO((base) + 0x28) | ||
86 | #define RING_GFX_MODE(base) _MMIO((base) + 0x29c) | ||
87 | #define VF_GUARDBAND _MMIO(0x83a4) | ||
88 | |||
80 | #endif | 89 | #endif |