i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API
Zhi Wang
reviewerPATCH 1/3 i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API
From: Zhi Wang <[email protected]>
To support the new mdev interfaces and the re-factor patches from Christoph, which moves the GVT-g code into a dedicated module, the GVT-g initialization path has to be separated into two phases:
a) Early initialization.
The early initialization of GVT requires to be done when loading i915. Mostly it's because the initial clean HW state needs to be saved before i915 touches the HW.
b) Late initalization.
This phases of initalization will setup the rest components of GVT-g, which can be done later when the dedicated module is being loaded.
v5:
- Re-design the mmio table framework. (Chirstoph)
v4:
- Fix the errors of patch checking scripts.
v3:
- Fix the errors when CONFIG_DRM_I915_WERROR is turned on. (Jani)
v2:
- Implement a mmio table instead of generating it by marco in i915. (Jani)
--- drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- drivers/gpu/drm/i915/gvt/gvt.c | 19 +- drivers/gpu/drm/i915/gvt/gvt.h | 21 +- drivers/gpu/drm/i915/gvt/handlers.c | 1878 +++++-------------------- drivers/gpu/drm/i915/gvt/mmio.h | 2 - drivers/gpu/drm/i915/gvt/mmio_table.c | 1386 ++++++++++++++++++ drivers/gpu/drm/i915/gvt/mmio_table.h | 58 + drivers/gpu/drm/i915/gvt/reg.h | 9 +- 9 files changed, 1796 insertions(+), 1581 deletions(-) create mode 100644 drivers/gpu/drm/i915/gvt/mmio_table.c create mode 100644 drivers/gpu/drm/i915/gvt/mmio_table.h
drivers/gpu/drm/i915/Makefile +1 -1
@@ -318,7 +318,7 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ i915-y += i915_vgpu.o ifeq ($(CONFIG_DRM_I915_GVT),y) -i915-y += intel_gvt.o +i915-y += intel_gvt.o gvt/mmio_table.o include $(src)/gvt/Makefile endif
drivers/gpu/drm/i915/gvt/cmd_parser.c +1 -1
@@ -3205,7 +3205,7 @@ int intel_gvt_scan_engine_context(struct intel_vgpu_workload *workload)static int init_cmd_table (struct intel_gvt *gvt) { -unsigned int gen_type =intel_gvt_get_device_type (gvt); +unsigned int gen_type =intel_gvt_get_device_type (gvt->gt->i915);int i;for (i =0 ; i <ARRAY_SIZE (cmd_info); i++) {
drivers/gpu/drm/i915/gvt/gvt.c +1 -18
@@ -63,23 +63,6 @@ static const struct intel_gvt_ops intel_gvt_ops = { .emulate_hotplug = intel_vgpu_emulate_hotplug, }; -static void init_device_info (struct intel_gvt *gvt) -{ -struct intel_gvt_device_info *info = &gvt->device_info; -struct pci_dev *pdev =to_pci_dev (gvt->gt->i915->drm.dev); - - info->max_support_vgpus =8 ; - info->cfg_space_size =PCI_CFG_SPACE_EXP_SIZE ; - info->mmio_size =2 *1024 *1024 ; - info->mmio_bar =0 ; - info->gtt_start_offset =8 *1024 *1024 ; - info->gtt_entry_size =8 ; - info->gtt_entry_size_shift =3 ; - info->gmadr_bytes_in_cmd =8 ; - info->max_surface_size =36 *1024 *1024 ; - info->msi_cap_offset = pdev->msi_cap; -} -static void intel_gvt_test_and_emulate_vblank (struct intel_gvt *gvt) {struct intel_vgpu *vgpu;
@@ -208,7 +191,7 @@ int intel_gvt_init_device(struct drm_i915_private *i915) gvt->gt =to_gt (i915); i915->gvt = gvt; -init_device_info (gvt); +intel_gvt_init_device_info (i915, &gvt->device_info); ret =intel_gvt_setup_mmio_info (gvt);if (ret)
drivers/gpu/drm/i915/gvt/gvt.h +4 -17
@@ -40,6 +40,7 @@#include "debug.h" #include "hypercall.h" #include "mmio.h" +#include "mmio_table.h" #include "reg.h" #include "interrupt.h" #include "gtt.h"
@@ -65,20 +66,6 @@ struct intel_gvt_host {extern struct intel_gvt_host intel_gvt_host; -/* Describe per-platform limitations. */ -struct intel_gvt_device_info { -u32 max_support_vgpus; -u32 cfg_space_size; -u32 mmio_size; -u32 mmio_bar; -unsigned long msi_cap_offset; -u32 gtt_start_offset; -u32 gtt_entry_size; -u32 gtt_entry_size_shift; -int gmadr_bytes_in_cmd; -u32 max_surface_size; -}; -/* GM resources owned by a vGPU */ struct intel_vgpu_gm {u64 aperture_sz;
@@ -239,9 +226,9 @@ struct intel_gvt_fence { };/* Special MMIO blocks. */ -struct gvt_mmio_block { +struct intel_gvt_mmio_block {unsigned int device; -i915_reg_t offset; +u32 offset;unsigned int size;gvt_mmio_func read;gvt_mmio_func write;
@@ -272,7 +259,7 @@ struct intel_gvt_mmio {/* Value of command write of this reg needs to be patched */ #define F_CMD_WRITE_PATCH (1 << 8) -const struct gvt_mmio_block *mmio_block; +struct intel_gvt_mmio_block *mmio_block;unsigned int num_mmio_block;DECLARE_HASHTABLE (mmio_info_table,INTEL_GVT_MMIO_HASH_BITS );
drivers/gpu/drm/i915/gvt/handlers.c +337 -1541
2,021 lines not on this page · raw message
drivers/gpu/drm/i915/gvt/mmio.h +0 -2
@@ -71,8 +71,6 @@ struct intel_gvt_mmio_info {const struct intel_engine_cs *intel_gvt_render_mmio_to_engine (struct intel_gvt *gvt,unsigned int reg); -unsigned long intel_gvt_get_device_type (struct intel_gvt *gvt); -bool intel_gvt_match_device (struct intel_gvt *gvt,unsigned long device);int intel_gvt_setup_mmio_info (struct intel_gvt *gvt);void intel_gvt_clean_mmio_info (struct intel_gvt *gvt);
drivers/gpu/drm/i915/gvt/mmio_table.c new file +1386 -0
878 lines not on this page · raw message
drivers/gpu/drm/i915/gvt/mmio_table.h new file +58 -0
58 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.
Zhi Wang
reviewerPATCH 2/3 i915/gvt: save the initial HW state snapshot in i915.
Save the inital HW state snapshot in i915 so that the rest code of GVT-g can be moved into a dedicated module while it can still get a clean initial HW state saved at the correct time during the initialization of i915. The futhrer vGPU created by GVT-g will use this HW state as the initial HW state.
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/intel_gvt.c | 110 ++++++++++++++++++++++++++++++- 2 files changed, 110 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -606,6 +606,8 @@ struct i915_virtual_gpu {struct mutex lock;/* serialises sending of g2v_notify command pkts */ bool active;u32 caps; +u32 *initial_mmio; +u8 *initial_cfg_space; };struct i915_selftest_stash {
drivers/gpu/drm/i915/intel_gvt.c +108 -2
135 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH 2/3] i915/gvt: save the initial HW state snapshot in i915.
Quoted 5 lines · Zhi Wang
drivers/gpu/drm/i915/intel_gvt.c +5
-0+static void save_mmio (struct intel_gvt_mmio_table_iter *iter,u32 offset, +u32 size) +{ +struct drm_i915_private *dev_priv = iter->i915; +void *mmio = iter->data;
drivers/gpu/drm/i915/intel_gvt.c void intel_gvt_sanitize_options(struct drm_i915_private *dev_priv) · line 114
Quoted 10 lines
drivers/gpu/drm/i915/intel_gvt.c +10
-0+u32 start, end, i; + + start = offset; + end = offset + size; + +for (i = start; i < end; i +=4 ) { + *(u32 *)(mmio + i) =intel_uncore_read_notrace ( +to_gt (dev_priv)->uncore,_MMIO (offset)); + } +}
This can be simplified to:
static void intel_gvt_save_mmio(struct intel_gvt_mmio_table_iter *iter,
u32 offset, u32 size)
{
struct drm_i915_private *dev_priv = iter->i915;
u32 *mmio = iter->data, i;
for (i = offset; i < offset + size; i += 4) {
mmio[i] = intel_uncore_read_notrace(to_gt(dev_priv)->uncore,
_MMIO(offset));
}
}drivers/gpu/drm/i915/intel_gvt.c void intel_gvt_sanitize_options(struct drm_i915_private *dev_priv) · line 146
Quoted 8 lines
drivers/gpu/drm/i915/intel_gvt.c +8
-0+struct pci_dev *pdev =to_pci_dev (dev_priv->drm.dev); +struct intel_gvt_device_info info; +struct i915_virtual_gpu *vgpu = &dev_priv->vgpu; +struct intel_gvt_mmio_table_iter iter; +void *mem; +int i, ret; + +intel_gvt_init_device_info (dev_priv, &info);
There is no real need for this call.
drivers/gpu/drm/i915/intel_gvt.c void intel_gvt_sanitize_options(struct drm_i915_private *dev_priv) · line 150
Quoted 4 lines
drivers/gpu/drm/i915/intel_gvt.c +4
-0+ + mem =kzalloc (info.cfg_space_size,GFP_KERNEL ); +if (!mem) +return -ENOMEM ;
info.cfg_space_size is always PCI_CFG_SPACE_EXP_SIZE, and the code relies onb that just a few lines below.
drivers/gpu/drm/i915/intel_gvt.c void intel_gvt_sanitize_options(struct drm_i915_private *dev_priv) · line 157
Quoted 1 line
drivers/gpu/drm/i915/intel_gvt.c +1
-0+ mem =vzalloc (info.mmio_size);
And info.mmio_size is a constant that can just use a define.
Zhi Wang
reviewerPATCH 3/3 i915/gvt: Use the initial HW state snapshot saved in i915
In reply to Zhi WangThe code of saving initial HW state snapshot has been moved into i915. Let the GVT-g core logic use that snapshot.
--- drivers/gpu/drm/i915/gvt/firmware.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/gvt/firmware.c +9 -16
@@ -66,22 +66,16 @@ static struct bin_attribute firmware_attr = { .mmap = NULL, }; -static int mmio_snapshot_handler (struct intel_gvt *gvt,u32 offset,void *data) -{ - *(u32 *)(data + offset) =intel_uncore_read_notrace (gvt->gt->uncore, -_MMIO (offset)); -return 0 ; -} -static int expose_firmware_sysfs (struct intel_gvt *gvt) {struct intel_gvt_device_info *info = &gvt->device_info; -struct pci_dev *pdev =to_pci_dev (gvt->gt->i915->drm.dev); +struct drm_i915_private *i915 = gvt->gt->i915; +struct pci_dev *pdev =to_pci_dev (i915->drm.dev);struct gvt_firmware_header *h;void *firmware;void *p;unsigned long size, crc32_start; -int i, ret; +int ret; size =sizeof (*h) + info->mmio_size + info->cfg_space_size; firmware =vzalloc (size);
@@ -99,17 +93,16 @@ static int expose_firmware_sysfs(struct intel_gvt *gvt) p = firmware + h->cfg_space_offset; -for (i =0 ; i < h->cfg_space_size; i +=4 ) -pci_read_config_dword (pdev, i, p + i); - -memcpy (gvt->firmware.cfg_space, p, info->cfg_space_size); +memcpy (gvt->firmware.cfg_space, i915->vgpu.initial_cfg_space, + info->cfg_space_size); +memcpy (p, gvt->firmware.cfg_space, info->cfg_space_size); p = firmware + h->mmio_offset; -/* Take a snapshot of hw mmio registers. */ -intel_gvt_for_each_tracked_mmio (gvt, mmio_snapshot_handler, p); +memcpy (gvt->firmware.mmio, i915->vgpu.initial_mmio, + info->mmio_size); -memcpy (gvt->firmware.mmio, p, info->mmio_size); +memcpy (p, gvt->firmware.mmio, info->mmio_size); crc32_start = offsetof(struct gvt_firmware_header , crc32) +4 ; h->crc32 =crc32_le (0 , firmware + crc32_start, size - crc32_start);
Signature · 1 line
2.25.1
What tree is this series against? It doesn't seem to apply to Linus' current tree or 5.17-rc1.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/3] i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API
In reply to Zhi Wang== Series Details ==
== Series Details ==
Series: series starting with [1/3] i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API
URL : https://patchwork.freedesktop.org/series/99420/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 1d24765d58ce i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API -:214: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #214: FILE: drivers/gpu/drm/i915/gvt/handlers.c:76: +static int setup_mmio_handler(struct intel_gvt *gvt, + u32 offset, u32 size, u32 device,
-:245: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #245: FILE: drivers/gpu/drm/i915/gvt/handlers.c:95:
+ WARN(1, "assign a handler to a non-tracked mmio %x\n",
+ i);
-:269: WARNING:MACRO_WITH_FLOW_CONTROL: Macros with flow control statements should be avoided #269: FILE: drivers/gpu/drm/i915/gvt/handlers.c:2091:
+#define MMIO_F(reg, s, d, r, w) do { \
+ ret = setup_mmio_handler(gvt, i915_mmio_reg_offset(reg), \
+ s, d, r, w); \
if (ret) \
return ret; \
} while (0)
-:301: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'prefix' - possible side-effects? #301: FILE: drivers/gpu/drm/i915/gvt/handlers.c:2101:
+#define MMIO_RING_F(prefix, s, d, r, w) do { \
+ MMIO_F(prefix(RENDER_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(BLT_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(GEN6_BSD_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(VEBOX_RING_BASE), s, d, r, w); \
if (HAS_ENGINE(gvt->gt, VCS1)) \
+ MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, d, r, w); \
} while (0)
-:301: CHECK:MACRO_ARG_REUSE: Macro argument reuse 's' - possible side-effects? #301: FILE: drivers/gpu/drm/i915/gvt/handlers.c:2101:
+#define MMIO_RING_F(prefix, s, d, r, w) do { \
+ MMIO_F(prefix(RENDER_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(BLT_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(GEN6_BSD_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(VEBOX_RING_BASE), s, d, r, w); \
if (HAS_ENGINE(gvt->gt, VCS1)) \
+ MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, d, r, w); \
} while (0)
-:301: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'd' - possible side-effects? #301: FILE: drivers/gpu/drm/i915/gvt/handlers.c:2101:
+#define MMIO_RING_F(prefix, s, d, r, w) do { \
+ MMIO_F(prefix(RENDER_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(BLT_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(GEN6_BSD_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(VEBOX_RING_BASE), s, d, r, w); \
if (HAS_ENGINE(gvt->gt, VCS1)) \
+ MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, d, r, w); \
} while (0)
-:301: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'r' - possible side-effects? #301: FILE: drivers/gpu/drm/i915/gvt/handlers.c:2101:
+#define MMIO_RING_F(prefix, s, d, r, w) do { \
+ MMIO_F(prefix(RENDER_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(BLT_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(GEN6_BSD_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(VEBOX_RING_BASE), s, d, r, w); \
if (HAS_ENGINE(gvt->gt, VCS1)) \
+ MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, d, r, w); \
} while (0)
-:301: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'w' - possible side-effects? #301: FILE: drivers/gpu/drm/i915/gvt/handlers.c:2101:
+#define MMIO_RING_F(prefix, s, d, r, w) do { \
+ MMIO_F(prefix(RENDER_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(BLT_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(GEN6_BSD_RING_BASE), s, d, r, w); \
+ MMIO_F(prefix(VEBOX_RING_BASE), s, d, r, w); \
if (HAS_ENGINE(gvt->gt, VCS1)) \
+ MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, d, r, w); \
} while (0)
-:2034: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2034: FILE: drivers/gpu/drm/i915/gvt/handlers.c:2407:
+ WARN(1, "dup mmio definition offset %x\n",
+ info->offset);
-:2064: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2064: FILE: drivers/gpu/drm/i915/gvt/handlers.c:2437:
+ ret = krealloc(block,
+ (gvt->mmio.num_mmio_block + 1) * sizeof(*block),
-:2069: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #2069: FILE: drivers/gpu/drm/i915/gvt/handlers.c:2442:
+ gvt->mmio.mmio_block = block = ret;
-:2213: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #2213:
new file mode 100644
-:2218: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #2218: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:1:
+/*
-:2291: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'd' - possible side-effects? #2291: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:74:
+#define MMIO_F(reg, s, f, am, rm, d) do { \
+ if (intel_gvt_get_device_type(iter->i915) & (d)) { \
+ ret = iter->do_mmio(i915_mmio_reg_offset(reg), \
+ f, s, am, rm, d, iter); \
+ if (ret) \
+ return ret; \
+ } \
+} while (0)
-:2291: WARNING:MACRO_WITH_FLOW_CONTROL: Macros with flow control statements should be avoided #2291: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:74:
+#define MMIO_F(reg, s, f, am, rm, d) do { \
+ if (intel_gvt_get_device_type(iter->i915) & (d)) { \
+ ret = iter->do_mmio(i915_mmio_reg_offset(reg), \
+ f, s, am, rm, d, iter); \
+ if (ret) \
+ return ret; \
+ } \
+} while (0)
-:2309: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'f' may be better as '(f)' to avoid precedence issues #2309: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:92:
+#define MMIO_RO(reg, d, f, rm) \
+ MMIO_F(reg, 4, F_RO | f, 0, rm, d)
-:2312: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'prefix' - possible side-effects? #2312: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:95:
+#define MMIO_RING_F(prefix, s, f, am, rm, d) do { \
+ MMIO_F(prefix(RENDER_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(BLT_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(GEN6_BSD_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(VEBOX_RING_BASE), s, f, am, rm, d); \
+ if (HAS_ENGINE(to_gt(iter->i915), VCS1)) \
+ MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, f, am, rm, d); \
+} while (0)
-:2312: CHECK:MACRO_ARG_REUSE: Macro argument reuse 's' - possible side-effects? #2312: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:95:
+#define MMIO_RING_F(prefix, s, f, am, rm, d) do { \
+ MMIO_F(prefix(RENDER_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(BLT_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(GEN6_BSD_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(VEBOX_RING_BASE), s, f, am, rm, d); \
+ if (HAS_ENGINE(to_gt(iter->i915), VCS1)) \
+ MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, f, am, rm, d); \
+} while (0)
-:2312: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'f' - possible side-effects? #2312: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:95:
+#define MMIO_RING_F(prefix, s, f, am, rm, d) do { \
+ MMIO_F(prefix(RENDER_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(BLT_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(GEN6_BSD_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(VEBOX_RING_BASE), s, f, am, rm, d); \
+ if (HAS_ENGINE(to_gt(iter->i915), VCS1)) \
+ MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, f, am, rm, d); \
+} while (0)
-:2312: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'am' - possible side-effects? #2312: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:95:
+#define MMIO_RING_F(prefix, s, f, am, rm, d) do { \
+ MMIO_F(prefix(RENDER_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(BLT_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(GEN6_BSD_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(VEBOX_RING_BASE), s, f, am, rm, d); \
+ if (HAS_ENGINE(to_gt(iter->i915), VCS1)) \
+ MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, f, am, rm, d); \
+} while (0)
-:2312: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'rm' - possible side-effects? #2312: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:95:
+#define MMIO_RING_F(prefix, s, f, am, rm, d) do { \
+ MMIO_F(prefix(RENDER_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(BLT_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(GEN6_BSD_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(VEBOX_RING_BASE), s, f, am, rm, d); \
+ if (HAS_ENGINE(to_gt(iter->i915), VCS1)) \
+ MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, f, am, rm, d); \
+} while (0)
-:2312: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'd' - possible side-effects? #2312: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:95:
+#define MMIO_RING_F(prefix, s, f, am, rm, d) do { \
+ MMIO_F(prefix(RENDER_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(BLT_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(GEN6_BSD_RING_BASE), s, f, am, rm, d); \
+ MMIO_F(prefix(VEBOX_RING_BASE), s, f, am, rm, d); \
+ if (HAS_ENGINE(to_gt(iter->i915), VCS1)) \
+ MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, f, am, rm, d); \
+} while (0)
-:2333: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'f' may be better as '(f)' to avoid precedence issues #2333: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:116:
+#define MMIO_RING_RO(prefix, d, f, rm) \
+ MMIO_RING_F(prefix, 4, F_RO | f, 0, rm, d)
-:2377: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2377: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:160:
+ MMIO_RING_DF(RING_REG, D_ALL,
+ F_MODE_MASK | F_CMD_ACCESS | F_CMD_WRITE_PATCH);
-:3076: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #3076: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:859:
+ MMIO_RING_F(RING_REG, 4, F_RO, 0,
+ ~_MASKED_BIT_ENABLE(RESET_CTL_REQUEST_RESET), D_BDW_PLUS);
-:3141: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #3141: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:924:
+ MMIO_F(_MMIO(0x24d0), 48, F_CMD_ACCESS | F_CMD_WRITE_PATCH, 0, 0,
+ D_BDW_PLUS);
-:3527: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'd' - possible side-effects? #3527: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:1310:
+#define MMIO_BLOCK(reg, s, d) do { \
+ if (intel_gvt_get_device_type(iter->i915) & d) { \
+ ret = iter->do_mmio_block(i915_mmio_reg_offset(reg), s, \
+ d, iter); \
+ if (ret) \
+ return ret; \
+ } \
+} while (0)
-:3527: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'd' may be better as '(d)' to avoid precedence issues #3527: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:1310:
+#define MMIO_BLOCK(reg, s, d) do { \
+ if (intel_gvt_get_device_type(iter->i915) & d) { \
+ ret = iter->do_mmio_block(i915_mmio_reg_offset(reg), s, \
+ d, iter); \
+ if (ret) \
+ return ret; \
+ } \
+} while (0)
-:3527: WARNING:MACRO_WITH_FLOW_CONTROL: Macros with flow control statements should be avoided #3527: FILE: drivers/gpu/drm/i915/gvt/mmio_table.c:1310:
+#define MMIO_BLOCK(reg, s, d) do { \
+ if (intel_gvt_get_device_type(iter->i915) & d) { \
+ ret = iter->do_mmio_block(i915_mmio_reg_offset(reg), s, \
+ d, iter); \
+ if (ret) \
+ return ret; \
+ } \
+} while (0)
-:3610: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #3610: FILE: drivers/gpu/drm/i915/gvt/mmio_table.h:1:
+/*
-:3660: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #3660: FILE: drivers/gpu/drm/i915/gvt/mmio_table.h:51:
+ int (*do_mmio_block)(u32 offset, u32 size, u32 device,
+ struct intel_gvt_mmio_table_iter *iter);
total: 0 errors, 6 warnings, 25 checks, 3580 lines checked edadf6a1e2bf i915/gvt: save the initial HW state snapshot in i915. -:6: WARNING:TYPO_SPELLING: 'inital' may be misspelled - perhaps 'initial'? #6:
Save the inital HW state snapshot in i915 so that the rest code of GVT-g
^^^^^^
-:64: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #64: FILE: drivers/gpu/drm/i915/intel_gvt.c:111:
+ *(u32 *)(mmio + i) = intel_uncore_read_notrace(
-:148: WARNING:TYPO_SPELLING: 'inital' may be misspelled - perhaps 'initial'? #148: FILE: drivers/gpu/drm/i915/intel_gvt.c:217:
+ drm_dbg(&dev_priv->drm, "Fail to save inital HW state\n");
^^^^^^
-:175: WARNING:FROM_SIGN_OFF_MISMATCH: From:/Signed-off-by: email address mismatch: 'From: Zhi Wang <[email protected]>' != 'Signed-off-by: Zhi Wang <[email protected]>'
total: 0 errors, 3 warnings, 1 checks, 143 lines checked bf04983df313 i915/gvt: Use the initial HW state snapshot saved in i915 -:57: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #57: FILE: drivers/gpu/drm/i915/gvt/firmware.c:97:
+ memcpy(gvt->firmware.cfg_space, i915->vgpu.initial_cfg_space,
+ info->cfg_space_size);
-:65: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #65: FILE: drivers/gpu/drm/i915/gvt/firmware.c:103:
+ memcpy(gvt->firmware.mmio, i915->vgpu.initial_mmio,
+ info->mmio_size);
-:71: WARNING:FROM_SIGN_OFF_MISMATCH: From:/Signed-off-by: email address mismatch: 'From: Zhi Wang <[email protected]>' != 'Signed-off-by: Zhi Wang <[email protected]>'
total: 0 errors, 1 warnings, 2 checks, 48 lines checked
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/3] i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API
In reply to Zhi Wang== Series Details ==
== Series Details ==
Series: series starting with [1/3] i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API
URL : https://patchwork.freedesktop.org/series/99420/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/3] i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API
In reply to Zhi Wang== Series Details ==
== Series Details ==
Series: series starting with [1/3] i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API
URL : https://patchwork.freedesktop.org/series/99420/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11151 -> Patchwork_22127
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/index.html
Participating hosts (46 -> 42)
------------------------------
Additional (1): fi-icl-u2
Missing (5): bat-adls-5 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Known issues
------------
Here are the changes found in Patchwork_22127 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@fork-gfx0:
- fi-icl-u2: NOTRUN -> [SKIP][1] ([fdo#109315]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/fi-icl-u2/igt@amdgpu/[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-icl-u2: NOTRUN -> [SKIP][2] ([i915#2190])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/fi-icl-u2/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-icl-u2: NOTRUN -> [SKIP][3] ([i915#4613]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/fi-icl-u2/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: NOTRUN -> [SKIP][4] ([fdo#111827]) +8 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/fi-icl-u2/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: NOTRUN -> [SKIP][5] ([fdo#109278]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/fi-icl-u2/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-icl-u2: NOTRUN -> [SKIP][6] ([fdo#109285])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/fi-icl-u2/igt@[email protected]
* igt@kms_psr@primary_page_flip:
- fi-skl-6600u: [PASS][7] -> [INCOMPLETE][8] ([i915#4547] / [i915#4838])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/fi-skl-6600u/igt@kms_psr@primary_page_flip.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/fi-skl-6600u/igt@kms_psr@primary_page_flip.html
* igt@prime_vgem@basic-userptr:
- fi-icl-u2: NOTRUN -> [SKIP][9] ([i915#3301])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/fi-icl-u2/igt@[email protected]
* igt@runner@aborted:
- fi-skl-6600u: NOTRUN -> [FAIL][10] ([i915#2722] / [i915#4312])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/fi-skl-6600u/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@hangcheck:
- bat-dg1-6: [DMESG-FAIL][11] ([i915#4494] / [i915#4957]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/bat-dg1-6/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/bat-dg1-6/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@i915_selftest@live@hangcheck:
- bat-dg1-5: [DMESG-FAIL][13] ([i915#4957]) -> [DMESG-FAIL][14] ([i915#4494] / [i915#4957])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/bat-dg1-5/igt@i915_selftest@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/bat-dg1-5/igt@i915_selftest@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4838]: https://gitlab.freedesktop.org/drm/intel/issues/4838
[i915#4897]: https://gitlab.freedesktop.org/drm/intel/issues/4897
[i915#4957]: https://gitlab.freedesktop.org/drm/intel/issues/4957
Build changes
-------------
* Linux: CI_DRM_11151 -> Patchwork_22127
CI-20190529: 20190529
CI_DRM_11151: 627e2885b51ab503a98aa89f0a0bd68416c731fc @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6336: ae2eb9e18bc58a4c45f28cfd80962938198dec3c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22127: bf04983df3135033102f5602b22ad139b87058e1 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
bf04983df313 i915/gvt: Use the initial HW state snapshot saved in i915 edadf6a1e2bf i915/gvt: save the initial HW state snapshot in i915. 1d24765d58ce i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/index.html
kernel test robot
build botI love your patch! Perhaps something to improve:
Hi Zhi,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
[also build test WARNING on next-20220127]
[cannot apply to drm-intel/for-linux-next v5.17-rc1]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Zhi-Wang/i915-gvt-Introduce-the-mmio_table-c-to-support-VFIO-new-mdev-API/20220127-200727 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20220128/202201280125.VuLtasAS-lkp(a)intel.com/config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/533f92651a7a56481a053f1e04dc5a5ec024ffb9
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Zhi-Wang/i915-gvt-Introduce-the-mmio_table-c-to-support-VFIO-new-mdev-API/20220127-200727 git checkout 533f92651a7a56481a053f1e04dc5a5ec024ffb9
# save the config file to linux build tree
mkdir build_dir
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/gvt/mmio_table.c:37: warning: expecting prototype for intel_gvt_get_init_device_info(). Prototype was for intel_gvt_init_device_info() instead
vim +37 drivers/gpu/drm/i915/gvt/mmio_table.c
28
29 /**
30 * intel_gvt_get_init_device_info - Fill a GVT device info
31 * @i915: drm i915 private data
32 * @info: GVT device info
33 *
34 * This function will be called during the initialization of a GVT device.
35 */
36 void intel_gvt_init_device_info(struct drm_i915_private *i915, struct intel_gvt_device_info *info)
> 37 {
38 struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
39
40 info->max_support_vgpus = 8;
41 info->cfg_space_size = PCI_CFG_SPACE_EXP_SIZE;
42 info->mmio_size = 2 * 1024 * 1024;
43 info->mmio_bar = 0;
44 info->gtt_start_offset = 8 * 1024 * 1024;
45 info->gtt_entry_size = 8;
46 info->gtt_entry_size_shift = 3;
47 info->gmadr_bytes_in_cmd = 8;
48 info->max_surface_size = 36 * 1024 * 1024;
49 info->msi_cap_offset = pdev->msi_cap;
50 }
51 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botI love your patch! Perhaps something to improve:
Hi Zhi,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
[also build test WARNING on next-20220127]
[cannot apply to drm-intel/for-linux-next hch-configfs/for-next v5.17-rc1] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Zhi-Wang/i915-gvt-Introduce-the-mmio_table-c-to-support-VFIO-new-mdev-API/20220127-200727 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: x86_64-randconfig-a005 (https://download.01.org/0day-ci/archive/20220128/202201280121.YX5gboDp-lkp(a)intel.com/config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project f32dccb9a43b02ce4e540d6ba5dbbdb188f2dc7d)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/533f92651a7a56481a053f1e04dc5a5ec024ffb9
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Zhi-Wang/i915-gvt-Introduce-the-mmio_table-c-to-support-VFIO-new-mdev-API/20220127-200727 git checkout 533f92651a7a56481a053f1e04dc5a5ec024ffb9
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/gvt/handlers.c:45:6: warning: no previous prototype for function 'intel_gvt_match_device' [-Wmissing-prototypes]
bool intel_gvt_match_device(struct intel_gvt *gvt,
^ drivers/gpu/drm/i915/gvt/handlers.c:45:1: note: declare 'static' if the function is not intended to be used outside of this translation unit bool intel_gvt_match_device(struct intel_gvt *gvt,
^
static
1 warning generated.
vim +/intel_gvt_match_device +45 drivers/gpu/drm/i915/gvt/handlers.c
12d14cc43b3470 Zhi Wang 2016-08-30 44
12d14cc43b3470 Zhi Wang 2016-08-30 @45 bool intel_gvt_match_device(struct intel_gvt *gvt,
12d14cc43b3470 Zhi Wang 2016-08-30 46 unsigned long device)
12d14cc43b3470 Zhi Wang 2016-08-30 47 {
533f92651a7a56 Zhi Wang 2022-01-27 48 return intel_gvt_get_device_type(gvt->gt->i915) & device;
12d14cc43b3470 Zhi Wang 2016-08-30 49 }12d14cc43b3470 Zhi Wang 2016-08-30 50
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botI love your patch! Perhaps something to improve:
Hi Zhi,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
[also build test WARNING on next-20220127]
[cannot apply to drm-intel/for-linux-next v5.17-rc1]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Zhi-Wang/i915-gvt-Introduce-the-mmio_table-c-to-support-VFIO-new-mdev-API/20220127-200727 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: x86_64-rhel-8.3 (https://download.01.org/0day-ci/archive/20220128/202201280218.aDxaMjx6-lkp(a)intel.com/config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/533f92651a7a56481a053f1e04dc5a5ec024ffb9
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Zhi-Wang/i915-gvt-Introduce-the-mmio_table-c-to-support-VFIO-new-mdev-API/20220127-200727 git checkout 533f92651a7a56481a053f1e04dc5a5ec024ffb9
# save the config file to linux build tree
mkdir build_dir
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/gvt/handlers.c:45:6: warning: no previous prototype for 'intel_gvt_match_device' [-Wmissing-prototypes]
45 | bool intel_gvt_match_device(struct intel_gvt *gvt,
| ^~~~~~~~~~~~~~~~~~~~~~
vim +/intel_gvt_match_device +45 drivers/gpu/drm/i915/gvt/handlers.c
12d14cc43b3470 Zhi Wang 2016-08-30 44
12d14cc43b3470 Zhi Wang 2016-08-30 @45 bool intel_gvt_match_device(struct intel_gvt *gvt,
12d14cc43b3470 Zhi Wang 2016-08-30 46 unsigned long device)
12d14cc43b3470 Zhi Wang 2016-08-30 47 {
533f92651a7a56 Zhi Wang 2022-01-27 48 return intel_gvt_get_device_type(gvt->gt->i915) & device;
12d14cc43b3470 Zhi Wang 2016-08-30 49 }12d14cc43b3470 Zhi Wang 2016-08-30 50
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [1/3] i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API
In reply to Zhi Wang== Series Details ==
== Series Details ==
Series: series starting with [1/3] i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API
URL : https://patchwork.freedesktop.org/series/99420/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11151_full -> Patchwork_22127_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_22127_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_22127_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_22127_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_flip@flip-vs-fences-interruptible@b-vga1:
- shard-snb: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-snb5/igt@kms_flip@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-snb4/igt@kms_flip@[email protected]
Known issues
------------
Here are the changes found in Patchwork_22127_full that come from known issues:
### CI changes ###
#### Possible fixes ####
* boot:
- shard-apl: ([PASS][3], [PASS][4], [PASS][5], [PASS][6], [PASS][7], [PASS][8], [PASS][9], [PASS][10], [PASS][11], [PASS][12], [PASS][13], [PASS][14], [PASS][15], [PASS][16], [PASS][17], [PASS][18], [PASS][19], [PASS][20], [PASS][21], [PASS][22], [PASS][23], [FAIL][24], [PASS][25], [PASS][26], [PASS][27]) ([i915#4386]) -> ([PASS][28], [PASS][29], [PASS][30], [PASS][31], [PASS][32], [PASS][33], [PASS][34], [PASS][35], [PASS][36], [PASS][37], [PASS][38], [PASS][39], [PASS][40], [PASS][41], [PASS][42], [PASS][43], [PASS][44], [PASS][45], [PASS][46], [PASS][47], [PASS][48], [PASS][49], [PASS][50], [PASS][51], [PASS][52])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl2/boot.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl3/boot.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl3/boot.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl3/boot.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl4/boot.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl4/boot.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl4/boot.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl6/boot.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl6/boot.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl6/boot.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl6/boot.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl7/boot.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl2/boot.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl2/boot.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl2/boot.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl7/boot.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl7/boot.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl8/boot.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl1/boot.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl1/boot.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl8/boot.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl1/boot.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl1/boot.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl8/boot.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl8/boot.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl1/boot.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl1/boot.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl1/boot.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl2/boot.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl2/boot.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl2/boot.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl2/boot.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl3/boot.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl3/boot.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl3/boot.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl4/boot.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl4/boot.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl4/boot.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl4/boot.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl6/boot.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl6/boot.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl6/boot.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/boot.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/boot.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/boot.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/boot.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/boot.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl8/boot.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl8/boot.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl8/boot.html
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@preservation-s3@rcs0:
- shard-apl: [PASS][53] -> [DMESG-WARN][54] ([i915#180]) +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl1/igt@gem_ctx_isolation@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/igt@gem_ctx_isolation@[email protected]
* igt@gem_ctx_sseu@invalid-args:
- shard-tglb: NOTRUN -> [SKIP][55] ([i915#280])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb1/igt@[email protected]
* igt@gem_exec_balancer@parallel-out-fence:
- shard-iclb: [PASS][56] -> [SKIP][57] ([i915#4525]) +1 similar issue
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-iclb1/igt@[email protected]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb8/igt@[email protected]
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: [PASS][58] -> [FAIL][59] ([i915#2842])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-tglb8/igt@gem_exec_fair@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb8/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [PASS][60] -> [FAIL][61] ([i915#2842])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-iclb8/igt@gem_exec_fair@[email protected]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb5/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-glk: NOTRUN -> [FAIL][62] ([i915#2842])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-glk1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-tglb: NOTRUN -> [FAIL][63] ([i915#2842])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@rcs0:
- shard-glk: [PASS][64] -> [FAIL][65] ([i915#2842])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-glk6/igt@gem_exec_fair@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-glk8/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-iclb: NOTRUN -> [FAIL][66] ([i915#2842]) +1 similar issue
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb4/igt@gem_exec_fair@[email protected]
- shard-kbl: [PASS][67] -> [FAIL][68] ([i915#2842])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-kbl3/igt@gem_exec_fair@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-kbl3/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [PASS][69] -> [FAIL][70] ([i915#2849])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-iclb7/igt@gem_exec_fair@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb1/igt@gem_exec_fair@[email protected]
* igt@gem_huc_copy@huc-copy:
- shard-apl: NOTRUN -> [SKIP][71] ([fdo#109271] / [i915#2190])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/igt@[email protected]
* igt@gem_lmem_swapping@heavy-random:
- shard-skl: NOTRUN -> [SKIP][72] ([fdo#109271] / [i915#4613])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl1/igt@[email protected]
* igt@gem_lmem_swapping@random:
- shard-apl: NOTRUN -> [SKIP][73] ([fdo#109271] / [i915#4613])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl3/igt@[email protected]
* igt@gem_pread@exhaustion:
- shard-skl: NOTRUN -> [WARN][74] ([i915#2658])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl1/igt@[email protected]
* igt@gem_userptr_blits@access-control:
- shard-iclb: NOTRUN -> [SKIP][75] ([i915#3297])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb6/igt@[email protected]
* igt@gem_userptr_blits@input-checking:
- shard-skl: NOTRUN -> [DMESG-WARN][76] ([i915#4990])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl10/igt@[email protected]
- shard-apl: NOTRUN -> [DMESG-WARN][77] ([i915#4990])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/igt@[email protected]
* igt@kms_big_fb@linear-16bpp-rotate-90:
- shard-tglb: NOTRUN -> [SKIP][78] ([fdo#111614])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb1/igt@[email protected]
* igt@kms_big_fb@linear-32bpp-rotate-180:
- shard-glk: [PASS][79] -> [DMESG-WARN][80] ([i915#118])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-glk6/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-glk8/igt@[email protected]
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-apl: NOTRUN -> [SKIP][81] ([fdo#109271] / [i915#3777])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl3/igt@[email protected]
* igt@kms_big_fb@yf-tiled-64bpp-rotate-270:
- shard-tglb: NOTRUN -> [SKIP][82] ([fdo#111615])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb1/igt@[email protected]
* igt@kms_big_fb@yf-tiled-64bpp-rotate-90:
- shard-iclb: NOTRUN -> [SKIP][83] ([fdo#110723])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb6/igt@[email protected]
* igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0:
- shard-apl: NOTRUN -> [SKIP][84] ([fdo#109271]) +82 similar issues
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl3/igt@[email protected]
* igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_rc_ccs:
- shard-glk: NOTRUN -> [SKIP][85] ([fdo#109271]) +16 similar issues
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-glk1/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_rc_ccs.html
* igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_gen12_mc_ccs:
- shard-iclb: NOTRUN -> [SKIP][86] ([fdo#109278] / [i915#3886])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb6/igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-crc-primary-basic-y_tiled_gen12_mc_ccs:
- shard-skl: NOTRUN -> [SKIP][87] ([fdo#109271] / [i915#3886]) +3 similar issues
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl1/igt@kms_ccs@pipe-b-crc-primary-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-missing-ccs-buffer-y_tiled_gen12_mc_ccs:
- shard-glk: NOTRUN -> [SKIP][88] ([fdo#109271] / [i915#3886])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-glk1/igt@kms_ccs@pipe-b-missing-ccs-buffer-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][89] ([fdo#109271] / [i915#3886]) +1 similar issue
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_mc_ccs.html
* igt@kms_chamelium@dp-crc-multiple:
- shard-apl: NOTRUN -> [SKIP][90] ([fdo#109271] / [fdo#111827]) +5 similar issues
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl3/igt@[email protected]
* igt@kms_chamelium@dp-crc-single:
- shard-iclb: NOTRUN -> [SKIP][91] ([fdo#109284] / [fdo#111827])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb6/igt@[email protected]
* igt@kms_chamelium@hdmi-crc-multiple:
- shard-tglb: NOTRUN -> [SKIP][92] ([fdo#109284] / [fdo#111827])
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb1/igt@[email protected]
* igt@kms_color_chamelium@pipe-b-ctm-0-25:
- shard-skl: NOTRUN -> [SKIP][93] ([fdo#109271] / [fdo#111827]) +6 similar issues
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl10/igt@[email protected]
* igt@kms_content_protection@lic:
- shard-tglb: NOTRUN -> [SKIP][94] ([i915#1063])
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb1/igt@[email protected]
* igt@kms_content_protection@srm:
- shard-apl: NOTRUN -> [TIMEOUT][95] ([i915#1319]) +1 similar issue
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-max-size-offscreen:
- shard-tglb: NOTRUN -> [SKIP][96] ([i915#3359]) +1 similar issue
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb1/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-32x32-random:
- shard-iclb: NOTRUN -> [SKIP][97] ([fdo#109278])
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb6/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:
- shard-tglb: NOTRUN -> [SKIP][98] ([fdo#109274] / [fdo#111825])
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb1/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-iclb: [PASS][99] -> [FAIL][100] ([i915#2346]) +1 similar issue
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-iclb5/igt@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb7/igt@[email protected]
- shard-skl: [PASS][101] -> [FAIL][102] ([i915#2346])
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-skl9/igt@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl1/igt@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank@ac-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][103] -> [FAIL][104] ([i915#79]) +1 similar issue
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-glk2/igt@kms_flip@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-glk2/igt@kms_flip@[email protected]
* igt@kms_flip@plain-flip-fb-recreate@a-edp1:
- shard-skl: [PASS][105] -> [FAIL][106] ([i915#2122])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-skl7/igt@kms_flip@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl9/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
- shard-snb: [PASS][107] -> [SKIP][108] ([fdo#109271])
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-snb7/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-snb2/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-render:
- shard-tglb: NOTRUN -> [SKIP][109] ([fdo#109280] / [fdo#111825]) +1 similar issue
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb1/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-render.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-blt:
- shard-skl: NOTRUN -> [SKIP][110] ([fdo#109271]) +76 similar issues
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl10/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- shard-skl: NOTRUN -> [SKIP][111] ([fdo#109271] / [i915#533])
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-apl: NOTRUN -> [FAIL][112] ([fdo#108145] / [i915#265]) +1 similar issue
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb:
- shard-skl: NOTRUN -> [FAIL][113] ([fdo#108145] / [i915#265]) +1 similar issue
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][114] -> [FAIL][115] ([fdo#108145] / [i915#265])
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-skl1/igt@[email protected]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl6/igt@[email protected]
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: [PASS][116] -> [SKIP][117] ([fdo#109441]) +1 similar issue
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb3/igt@kms_psr@psr2_sprite_blt.html
* igt@kms_setmode@basic:
- shard-glk: [PASS][118] -> [FAIL][119] ([i915#31])
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-glk6/igt@[email protected]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-glk8/igt@[email protected]
* igt@kms_vblank@pipe-d-wait-idle:
- shard-apl: NOTRUN -> [SKIP][120] ([fdo#109271] / [i915#533])
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl3/igt@[email protected]
* igt@perf@per-context-mode-unprivileged:
- shard-tglb: NOTRUN -> [SKIP][121] ([fdo#109289])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb1/igt@[email protected]
* igt@perf@polling-parameterized:
- shard-apl: NOTRUN -> [FAIL][122] ([i915#1542])
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl3/igt@[email protected]
* igt@prime_nv_pcopy@test3_3:
- shard-tglb: NOTRUN -> [SKIP][123] ([fdo#109291])
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb1/igt@prime_nv_pcopy@test3_3.html
* igt@prime_vgem@coherency-gtt:
- shard-iclb: NOTRUN -> [SKIP][124] ([fdo#109292])
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb6/igt@[email protected]
* igt@sysfs_clients@recycle-many:
- shard-apl: NOTRUN -> [SKIP][125] ([fdo#109271] / [i915#2994])
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl3/igt@[email protected]
* igt@sysfs_clients@split-10:
- shard-skl: NOTRUN -> [SKIP][126] ([fdo#109271] / [i915#2994])
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl1/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_balancer@parallel:
- shard-iclb: [SKIP][127] ([i915#4525]) -> [PASS][128] +1 similar issue
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-iclb6/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb2/igt@[email protected]
* igt@gem_exec_endless@dispatch@vcs0:
- shard-tglb: [INCOMPLETE][129] ([i915#3778]) -> [PASS][130]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-tglb5/igt@gem_exec_endless@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb6/igt@gem_exec_endless@[email protected]
* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [FAIL][131] ([i915#2842]) -> [PASS][132] +1 similar issue
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-kbl7/igt@gem_exec_fair@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-kbl1/igt@gem_exec_fair@[email protected]
- shard-apl: [FAIL][133] ([i915#2842]) -> [PASS][134]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl6/igt@gem_exec_fair@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [FAIL][135] ([i915#2842]) -> [PASS][136]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-tglb5/igt@gem_exec_fair@[email protected]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-tglb2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_schedule@smoketest@vecs0:
- shard-skl: [DMESG-WARN][137] ([i915#1982]) -> [PASS][138]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-skl1/igt@gem_exec_schedule@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl6/igt@gem_exec_schedule@[email protected]
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-apl: [FAIL][139] ([i915#644]) -> [PASS][140]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl4/igt@[email protected]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl4/igt@[email protected]
* igt@gen9_exec_parse@allowed-all:
- shard-glk: [DMESG-WARN][141] ([i915#1436] / [i915#716]) -> [PASS][142]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-glk2/igt@[email protected]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-glk1/igt@[email protected]
* igt@i915_suspend@fence-restore-untiled:
- shard-apl: [DMESG-WARN][143] ([i915#180]) -> [PASS][144] +2 similar issues
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-apl3/igt@[email protected]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-apl7/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-skl: [INCOMPLETE][145] ([i915#2828] / [i915#300]) -> [PASS][146]
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-skl1/igt@[email protected]
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl10/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [FAIL][147] ([i915#2346] / [i915#533]) -> [PASS][148]
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-skl9/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl1/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling:
- shard-iclb: [SKIP][149] ([i915#3701]) -> [PASS][150] +1 similar issue
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling.html
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb3/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling.html
* igt@kms_hdr@bpc-switch:
- shard-skl: [FAIL][151] ([i915#1188]) -> [PASS][152]
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-skl9/igt@[email protected]
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl4/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][153] ([fdo#108145] / [i915#265]) -> [PASS][154]
[153]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-skl8/igt@[email protected]
[154]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl10/igt@[email protected]
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [SKIP][155] ([fdo#109441]) -> [PASS][156] +2 similar issues
[155]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-iclb6/igt@kms_psr@psr2_cursor_mmap_cpu.html
[156]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
#### Warnings ####
* igt@gem_exec_balancer@parallel-ordering:
- shard-iclb: [SKIP][157] ([i915#4525]) -> [FAIL][158] ([i915#4916])
[157]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-iclb6/igt@[email protected]
[158]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb2/igt@[email protected]
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][159] ([i915#588]) -> [SKIP][160] ([i915#658])
[159]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-iclb2/igt@[email protected]
[160]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb3/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][161] ([i915#1804] / [i915#2684]) -> [WARN][162] ([i915#2684])
[161]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-iclb4/igt@[email protected]
[162]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb8/igt@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [FAIL][163] ([i915#1188]) -> [INCOMPLETE][164] ([i915#2828])
[163]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-skl9/igt@[email protected]
[164]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-skl1/igt@[email protected]
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area:
- shard-iclb: [SKIP][165] ([i915#2920]) -> [SKIP][166] ([fdo#111068] / [i915#658])
[165]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11151/shard-iclb2/igt@[email protected]
[166]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/shard-iclb3/igt@[email protected]
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area:
- shard-iclb: [SKIP][167] ([fdo#111068] / [i915#658]) -> [SKIP][168] ([i915#2920]) +1 similar issue
[167]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_111
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22127/index.html
kernel test robot
build bot[RFC PATCH] i915/gvt: intel_gvt_match_device() can be static
In reply to Zhi Wangdrivers/gpu/drm/i915/gvt/handlers.c:45:6: warning: symbol 'intel_gvt_match_device' was not declared. Should it be static?
drivers/gpu/drm/i915/gvt/handlers.c:45:6: warning: symbol 'intel_gvt_match_device' was not declared. Should it be static?
--- handlers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gvt/handlers.c +1 -1
@@ -42,7 +42,7 @@#include "display/intel_display_types.h" #include "display/intel_fbc.h" -bool intel_gvt_match_device (struct intel_gvt *gvt, +static bool intel_gvt_match_device (struct intel_gvt *gvt,unsigned long device) {return intel_gvt_get_device_type (gvt->gt->i915) & device;
kernel test robot
build botI love your patch! Perhaps something to improve:
Hi Zhi,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
[also build test WARNING on next-20220127]
[cannot apply to drm-intel/for-linux-next hch-configfs/for-next v5.17-rc1] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Zhi-Wang/i915-gvt-Introduce-the-mmio_table-c-to-support-VFIO-new-mdev-API/20220127-200727 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: x86_64-rhel-8.3-kselftests (https://download.01.org/0day-ci/archive/20220128/202201281209.mnHCKgPp-lkp(a)intel.com/config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.4-dirty # https://github.com/0day-ci/linux/commit/533f92651a7a56481a053f1e04dc5a5ec024ffb9 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Zhi-Wang/i915-gvt-Introduce-the-mmio_table-c-to-support-VFIO-new-mdev-API/20220127-200727 git checkout 533f92651a7a56481a053f1e04dc5a5ec024ffb9 # save the config file to linux build tree mkdir build_dir make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/gvt/handlers.c:45:6: sparse: sparse: symbol 'intel_gvt_match_device' was not declared. Should it be static?
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
drivers/gpu/drm/i915/Makefile i915-$(CONFIG_DRM_I915_SELFTEST) += \ · line 321
Quoted 3 lines
ifeq ($(CONFIG_DRM_I915_GVT),y)
drivers/gpu/drm/i915/Makefile +1
-1-i915-y += intel_gvt.o +i915-y += intel_gvt.o gvt/mmio_table.o
With the split from my series in mind that builds all of the gvt/ subdirectory into a separate module I'd be tempted to places this new file into the main i915 directory as e.g. intel_gvt_mmio_table.c, given that it will have to be built into the main i915 module.
Quoted 1 line
-static void
init_device_info(struct intel_gvt *gvt)
I'd keep this function as-is, as the newly added caller isn't actually needed (I'll comment on this more on the next patch).
drivers/gpu/drm/i915/gvt/gvt.h struct intel_gvt_host { · line 80
Quoted 13 lines
drivers/gpu/drm/i915/gvt/gvt.h +0
-13-/* Describe per-platform limitations. */ -struct intel_gvt_device_info { -u32 max_support_vgpus; -u32 cfg_space_size; -u32 mmio_size; -u32 mmio_bar; -unsigned long msi_cap_offset; -u32 gtt_start_offset; -u32 gtt_entry_size; -u32 gtt_entry_size_shift; -int gmadr_bytes_in_cmd; -u32 max_surface_size; -};
.. and with that there should be no need to move this declaration as well.
drivers/gpu/drm/i915/gvt/gvt.h struct intel_gvt_fence { · line 229
Quoted 2 lines
drivers/gpu/drm/i915/gvt/gvt.h +1
-1-struct gvt_mmio_block { +struct intel_gvt_mmio_block {
Any good reason for this rename? It just seems to create a lot of churn without muchof a reason.
drivers/gpu/drm/i915/gvt/handlers.c void intel_gvt_clean_mmio_info(struct intel_gvt *gvt) · line 2383
Quoted 3 lines
drivers/gpu/drm/i915/gvt/handlers.c +3
-0+static int do_mmio (u32 offset,u16 flags,u32 size,u32 addr_mask, +u32 ro_mask,u32 device, +struct intel_gvt_mmio_table_iter *iter)
Nit: I'd pass the iter first to these kinds of callbacks. Also the do_ name (including for the method name in the struct itself) looks odd. I'd rather use a _cb or _fn postfix.
Quoted 8 lines
drivers/gpu/drm/i915/gvt/handlers.c +8
-0+for (i = start; i < end; i +=4 ) { + info =kzalloc (sizeof (*info),GFP_KERNEL ); +if (!info) +return -ENOMEM ; + + info->offset = i; + p =intel_gvt_find_mmio_info (gvt, info->offset); +if (p) {
drivers/gpu/drm/i915/gvt/handlers.c void intel_gvt_clean_mmio_info(struct intel_gvt *gvt) · line 2415
Quoted 10 lines
drivers/gpu/drm/i915/gvt/handlers.c +10
-0+WARN (1 ,"dup mmio definition offset %x\n" , + info->offset); +kfree (info); + +/* We return -EEXIST here to make GVT-g load fail. +* So duplicated MMIO can be found as soon as +* possible. +*/ +return -EEXIST ; + }
I'd allocate the new structure only after the lookup to simplify this a bit.
Review
Quoted 2 lines
(quoted diff) +2
-0+ + info->ro_mask = ro_mask;
The r/o mask is only used here, so why not move it into the local declarations in handlers.c instead of the table built into i915.ko?
drivers/gpu/drm/i915/gvt/handlers.c void intel_gvt_clean_mmio_info(struct intel_gvt *gvt) · line 2420
Quoted 3 lines
drivers/gpu/drm/i915/gvt/handlers.c +3
-0+ info->device = device; + info->read = intel_vgpu_default_mmio_read; + info->write = intel_vgpu_default_mmio_write;
Given that we always initialize ->read and ->write here, setup_mmio_handler can be simplified a bit and only needs to override the handlers if actually specified in the table.
drivers/gpu/drm/i915/gvt/handlers.c void intel_gvt_clean_mmio_info(struct intel_gvt *gvt) · line 2462
Quoted 8 lines
drivers/gpu/drm/i915/gvt/handlers.c +8
-0+static int init_mmio_info (struct intel_gvt *gvt) +{ +struct intel_gvt_mmio_table_iter iter; + + iter.i915 = gvt->gt->i915; + iter.data = gvt; + iter.do_mmio = do_mmio; + iter.do_mmio_block = do_mmio_block;
Nit: This and the other caller could initialize the iter structure statically:
struct intel_gvt_mmio_table_iter iter = {
.i915 = gvt->gt->i915,
.data = gvt,
.mmio_cb = intel_gvt_setup_mmio_cb,
.mmio_block_cb = intel_gvt_setup_mmio_block_cb,
};drivers/gpu/drm/i915/gvt/handlers.c void intel_gvt_clean_mmio_info(struct intel_gvt *gvt) · line 2473
Quoted 3 lines
drivers/gpu/drm/i915/gvt/handlers.c +3
-0+ block =find_mmio_block (gvt,VGT_PVINFO_PAGE ); + block->read = pvinfo_mmio_read; + block->write = pvinfo_mmio_write;
Check for NULL here?
drivers/gpu/drm/i915/gvt/handlers.c int intel_gvt_setup_mmio_info(struct intel_gvt *gvt) · line 2519
Quoted 9 lines
drivers/gpu/drm/i915/gvt/handlers.c +4
-4}else if (IS_SKYLAKE (i915) || -IS_KABYLAKE (i915) || -IS_COFFEELAKE (i915) || -IS_COMETLAKE (i915)) { - ret =init_bdw_mmio_info (gvt); +IS_KABYLAKE (i915) || +IS_COFFEELAKE (i915) || +IS_COMETLAKE (i915)) { + ret =init_bdw_mmio_handlers (gvt);
Why the spurious reformatting?
Quoted 11 lines
drivers/gpu/drm/i915/gvt/mmio_table.c new file +11
-0+/** +* intel_gvt_get_device_type - return the device flag of a GVT device +* @i915: drm i915 private data +* +* This function will return the device flag of a GVT device. +*/ +unsigned long intel_gvt_get_device_type (struct drm_i915_private *i915) +{ +if (IS_BROADWELL (i915)) +return D_BDW ; +else if (IS_SKYLAKE (i915))
drivers/gpu/drm/i915/gvt/mmio_table.c line 72
Quoted 10 lines
drivers/gpu/drm/i915/gvt/mmio_table.c new file +10
-0+return D_SKL ; + else if (IS_KABYLAKE(i915)) + return D_KBL; + else if (IS_BROXTON(i915)) + return D_BXT; + else if (IS_COFFEELAKE(i915) || IS_COMETLAKE(i915)) + return D_CFL; + +return 0 ; +}
I'd move this into intel_gvt.c, next to is_supported_device which also lists all the supported platforms. Preferably as a prep patch that does the move and change of argument before the main MMIO table patch.
Quoted 1 line
+++
b/drivers/gpu/drm/i915/gvt/mmio_table.h
Do we really need this new header vs just using intel_gvt.h?
Any comments on my suggestions? Should I help to implement them?
Quoted 3,697 lines · Zhi Wang
From: Zhi Wang <[email protected]>
To support the new mdev interfaces and the re-factor patches from Christoph, which moves the GVT-g code into a dedicated module, the GVT-g initialization path has to be separated into two phases:
a) Early initialization.
The early initialization of GVT requires to be done when loading i915. Mostly it's because the initial clean HW state needs to be saved before i915 touches the HW.
b) Late initalization.
This phases of initalization will setup the rest components of GVT-g, which can be done later when the dedicated module is being loaded.
v5:
- Re-design the mmio table framework. (Chirstoph)
v4:
- Fix the errors of patch checking scripts.
v3:
- Fix the errors when
CONFIG_DRM_I915_WERRORis turned on. (Jani)v2:
- Implement a mmio table instead of generating it by marco in i915. (Jani)
Cc Christoph Hellwig <[email protected]>Cc Jason Gunthorpe <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Vivi Rodrigo <[email protected]>Cc Zhenyu Wang <[email protected]>Cc Zhi Wang <[email protected]>Tested-by Terrence Xu <[email protected]>Signed-off-by Zhi Wang <[email protected]>--- drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- drivers/gpu/drm/i915/gvt/gvt.c | 19 +- drivers/gpu/drm/i915/gvt/gvt.h | 21 +- drivers/gpu/drm/i915/gvt/handlers.c | 1878 +++++-------------------- drivers/gpu/drm/i915/gvt/mmio.h | 2 - drivers/gpu/drm/i915/gvt/mmio_table.c | 1386 ++++++++++++++++++ drivers/gpu/drm/i915/gvt/mmio_table.h | 58 + drivers/gpu/drm/i915/gvt/reg.h | 9 +- 9 files changed, 1796 insertions(+), 1581 deletions(-) create mode 100644 drivers/gpu/drm/i915/gvt/mmio_table.c create mode 100644 drivers/gpu/drm/i915/gvt/mmio_table.hdrivers/gpu/drm/i915/Makefile +1
-1@@ -318,7 +318,7 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ i915-y += i915_vgpu.o ifeq ($(CONFIG_DRM_I915_GVT),y) -i915-y += intel_gvt.o +i915-y += intel_gvt.o gvt/mmio_table.o include $(src)/gvt/Makefile endifdrivers/gpu/drm/i915/gvt/cmd_parser.c +1
-1@@ -3205,7 +3205,7 @@ int intel_gvt_scan_engine_context(struct intel_vgpu_workload *workload)static int init_cmd_table (struct intel_gvt *gvt) { -unsigned int gen_type =intel_gvt_get_device_type (gvt); +unsigned int gen_type =intel_gvt_get_device_type (gvt->gt->i915);int i;for (i =0 ; i <ARRAY_SIZE (cmd_info); i++) {drivers/gpu/drm/i915/gvt/gvt.c +1
-18@@ -63,23 +63,6 @@ static const struct intel_gvt_ops intel_gvt_ops = { .emulate_hotplug = intel_vgpu_emulate_hotplug, }; -static void init_device_info (struct intel_gvt *gvt) -{ -struct intel_gvt_device_info *info = &gvt->device_info; -struct pci_dev *pdev =to_pci_dev (gvt->gt->i915->drm.dev); - - info->max_support_vgpus =8 ; - info->cfg_space_size =PCI_CFG_SPACE_EXP_SIZE ; - info->mmio_size =2 *1024 *1024 ; - info->mmio_bar =0 ; - info->gtt_start_offset =8 *1024 *1024 ; - info->gtt_entry_size =8 ; - info->gtt_entry_size_shift =3 ; - info->gmadr_bytes_in_cmd =8 ; - info->max_surface_size =36 *1024 *1024 ; - info->msi_cap_offset = pdev->msi_cap; -} -static void intel_gvt_test_and_emulate_vblank (struct intel_gvt *gvt) {struct intel_vgpu *vgpu;@@ -208,7 +191,7 @@ int intel_gvt_init_device(struct drm_i915_private *i915) gvt->gt =to_gt (i915); i915->gvt = gvt; -init_device_info (gvt); +intel_gvt_init_device_info (i915, &gvt->device_info); ret =intel_gvt_setup_mmio_info (gvt);if (ret)drivers/gpu/drm/i915/gvt/gvt.h +4
-17@@ -40,6 +40,7 @@#include "debug.h" #include "hypercall.h" #include "mmio.h" +#include "mmio_table.h" #include "reg.h" #include "interrupt.h" #include "gtt.h" @@ -65,20 +66,6 @@ struct intel_gvt_host {extern struct intel_gvt_host intel_gvt_host; -/* Describe per-platform limitations. */ -struct intel_gvt_device_info { -u32 max_support_vgpus; -u32 cfg_space_size; -u32 mmio_size; -u32 mmio_bar; -unsigned long msi_cap_offset; -u32 gtt_start_offset; -u32 gtt_entry_size; -u32 gtt_entry_size_shift; -int gmadr_bytes_in_cmd; -u32 max_surface_size; -}; -/* GM resources owned by a vGPU */ struct intel_vgpu_gm {u64 aperture_sz;@@ -239,9 +226,9 @@ struct intel_gvt_fence { };/* Special MMIO blocks. */ -struct gvt_mmio_block { +struct intel_gvt_mmio_block {unsigned int device; -i915_reg_t offset; +u32 offset;unsigned int size;gvt_mmio_func read;gvt_mmio_func write;@@ -272,7 +259,7 @@ struct intel_gvt_mmio {/* Value of command write of this reg needs to be patched */ #define F_CMD_WRITE_PATCH (1 << 8) -const struct gvt_mmio_block *mmio_block; +struct intel_gvt_mmio_block *mmio_block;unsigned int num_mmio_block;DECLARE_HASHTABLE (mmio_info_table,INTEL_GVT_MMIO_HASH_BITS );drivers/gpu/drm/i915/gvt/handlers.c +337
-1541@@ -42,35 +42,10 @@#include "display/intel_display_types.h" #include "display/intel_fbc.h" -/* XXX FIXME i915 has changed PP_XXX definition */ -#define PCH_PP_STATUS _MMIO(0xc7200) -#define PCH_PP_CONTROL _MMIO(0xc7204) -#define PCH_PP_ON_DELAYS _MMIO(0xc7208) -#define PCH_PP_OFF_DELAYS _MMIO(0xc720c) -#define PCH_PP_DIVISOR _MMIO(0xc7210) - -unsigned long intel_gvt_get_device_type (struct intel_gvt *gvt) -{ -struct drm_i915_private *i915 = gvt->gt->i915; - -if (IS_BROADWELL (i915)) -return D_BDW ; -else if (IS_SKYLAKE (i915)) -return D_SKL ; -else if (IS_KABYLAKE (i915)) -return D_KBL ; -else if (IS_BROXTON (i915)) -return D_BXT ; -else if (IS_COFFEELAKE (i915) ||IS_COMETLAKE (i915)) -return D_CFL ; - -return 0 ; -} -bool intel_gvt_match_device (struct intel_gvt *gvt,unsigned long device) { -return intel_gvt_get_device_type (gvt) & device; +return intel_gvt_get_device_type (gvt->gt->i915) & device; } static void read_vreg(struct intel_vgpu *vgpu, unsigned int offset,@@ -97,12 +72,11 @@ struct intel_gvt_mmio_info *intel_gvt_find_mmio_info(struct intel_gvt *gvt,return NULL ; } -static int new_mmio_info (struct intel_gvt *gvt, -u32 offset,u16 flags,u32 size, -u32 addr_mask,u32 ro_mask,u32 device, +static int setup_mmio_handler (struct intel_gvt *gvt, +u32 offset,u32 size,u32 device,gvt_mmio_func read,gvt_mmio_func write) { -struct intel_gvt_mmio_info *info, *p; +struct intel_gvt_mmio_info *p;u32 start, end, i;if (!intel_gvt_match_device (gvt, device))@@ -115,32 +89,14 @@ static int new_mmio_info(struct intel_gvt *gvt, end = offset + size;for (i = start; i < end; i +=4 ) { - info =kzalloc (sizeof (*info),GFP_KERNEL ); -if (!info) -return -ENOMEM ; - - info->offset = i; - p =intel_gvt_find_mmio_info (gvt, info->offset); -if (p) { -WARN (1 ,"dup mmio definition offset %x\n" , - info->offset); -kfree (info); - -/* We return -EEXIST here to make GVT-g load fail. -* So duplicated MMIO can be found as soon as -* possible. -*/ -return -EEXIST ; + p =intel_gvt_find_mmio_info (gvt, i); +if (!p) { +WARN (1 ,"assign a handler to a non-tracked mmio %x\n" , + i); +return -ENODEV ; } - - info->ro_mask = ro_mask; - info->device = device; - info->read = read ? read : intel_vgpu_default_mmio_read; - info->write = write ? write : intel_vgpu_default_mmio_write; - gvt->mmio.mmio_attribute[info->offset /4 ] = flags; -INIT_HLIST_NODE (&info->node); -hash_add (gvt->mmio.mmio_info_table, &info->node, info->offset); - gvt->mmio.num_tracked_mmio++; + p->read = read ? read : intel_vgpu_default_mmio_read; + p->write = write ? write : intel_vgpu_default_mmio_write; }return 0 ; }@@ -2132,1516 +2088,266 @@ static int csfe_chicken1_mmio_write(struct intel_vgpu *vgpu,return 0 ; } -#define MMIO_F (reg, s, f, am, rm, d, r, w) do { \ - ret = new_mmio_info(gvt, i915_mmio_reg_offset(reg), \ - f, s, am, rm, d, r, w); \ +#define MMIO_F (reg, s, d, r, w) do { \ + ret = setup_mmio_handler(gvt, i915_mmio_reg_offset(reg), \ + s, d, r, w); \ if (ret) \ return ret; \ } while (0) -#define MMIO_D (reg, d) \ - MMIO_F(reg, 4, 0, 0, 0, d, NULL, NULL) +#define MMIO_H (reg, d, r, w) \ + MMIO_F(reg, d, 4, r, w) -#define MMIO_DH (reg, d, r, w) \ - MMIO_F(reg, 4, 0, 0, 0, d, r, w) - -#define MMIO_DFH (reg, d, f, r, w) \ - MMIO_F(reg, 4, f, 0, 0, d, r, w) - -#define MMIO_GM (reg, d, r, w) \ - MMIO_F(reg, 4, F_GMADR, 0xFFFFF000, 0, d, r, w) - -#define MMIO_GM_RDR (reg, d, r, w) \ - MMIO_F(reg, 4, F_GMADR | F_CMD_ACCESS, 0xFFFFF000, 0, d, r, w) - -#define MMIO_RO (reg, d, f, rm, r, w) \ - MMIO_F(reg, 4, F_RO | f, 0, rm, d, r, w) - -#define MMIO_RING_F (prefix, s, f, am, rm, d, r, w) do { \ - MMIO_F(prefix(RENDER_RING_BASE), s, f, am, rm, d, r, w); \ - MMIO_F(prefix(BLT_RING_BASE), s, f, am, rm, d, r, w); \ - MMIO_F(prefix(GEN6_BSD_RING_BASE), s, f, am, rm, d, r, w); \ - MMIO_F(prefix(VEBOX_RING_BASE), s, f, am, rm, d, r, w); \ +#define MMIO_RING_F (prefix, s, d, r, w) do { \ + MMIO_F(prefix(RENDER_RING_BASE), s, d, r, w); \ + MMIO_F(prefix(BLT_RING_BASE), s, d, r, w); \ + MMIO_F(prefix(GEN6_BSD_RING_BASE), s, d, r, w); \ + MMIO_F(prefix(VEBOX_RING_BASE), s, d, r, w); \ if (HAS_ENGINE(gvt->gt, VCS1)) \ - MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, f, am, rm, d, r, w); \ + MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, d, r, w); \ } while (0) -#define MMIO_RING_D (prefix, d) \ - MMIO_RING_F(prefix, 4, 0, 0, 0, d, NULL, NULL) +#define MMIO_RING_H (prefix, d, r, w) \ + MMIO_RING_F(prefix, 4, d, r, w) -#define MMIO_RING_DFH (prefix, d, f, r, w) \ - MMIO_RING_F(prefix, 4, f, 0, 0, d, r, w) - -#define MMIO_RING_GM (prefix, d, r, w) \ - MMIO_RING_F(prefix, 4, F_GMADR, 0xFFFF0000, 0, d, r, w) - -#define MMIO_RING_GM_RDR (prefix, d, r, w) \ - MMIO_RING_F(prefix, 4, F_GMADR | F_CMD_ACCESS, 0xFFFF0000, 0, d, r, w) - -#define MMIO_RING_RO (prefix, d, f, rm, r, w) \ - MMIO_RING_F(prefix, 4, F_RO | f, 0, rm, d, r, w) - -static int init_generic_mmio_info (struct intel_gvt *gvt) +static int init_generic_mmio_handlers (struct intel_gvt *gvt) {struct drm_i915_private *dev_priv = gvt->gt->i915;int ret; -MMIO_RING_DFH (RING_IMR ,D_ALL ,0 ,NULL , - intel_vgpu_reg_imr_handler); - -MMIO_DFH (SDEIMR ,D_ALL ,0 ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DFH (SDEIER ,D_ALL ,0 ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DFH (SDEIIR ,D_ALL ,0 ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (SDEISR ,D_ALL ); - -MMIO_RING_DFH (RING_HWSTAM ,D_ALL ,0 ,NULL ,NULL ); - - -MMIO_DH (GEN8_GAMW_ECO_DEV_RW_IA ,D_BDW_PLUS ,NULL , - gamw_echo_dev_rw_ia_write); - -MMIO_GM_RDR (BSD_HWS_PGA_GEN7 ,D_ALL ,NULL ,NULL ); -MMIO_GM_RDR (BLT_HWS_PGA_GEN7 ,D_ALL ,NULL ,NULL ); -MMIO_GM_RDR (VEBOX_HWS_PGA_GEN7 ,D_ALL ,NULL ,NULL ); - -#define RING_REG (base) _MMIO((base) + 0x28) -MMIO_RING_DFH (RING_REG ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -#undef RING_REG - -#define RING_REG (base) _MMIO((base) + 0x134) -MMIO_RING_DFH (RING_REG ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -#undef RING_REG +MMIO_RING_H (RING_IMR ,D_ALL ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (SDEIMR ,D_ALL ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (SDEIER ,D_ALL ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (SDEIIR ,D_ALL ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_GAMW_ECO_DEV_RW_IA ,D_BDW_PLUS ,NULL , gamw_echo_dev_rw_ia_write);#define RING_REG (base) _MMIO((base) + 0x6c) -MMIO_RING_DFH (RING_REG ,D_ALL ,0 , mmio_read_from_hw,NULL ); +MMIO_RING_H (RING_REG ,D_ALL , mmio_read_from_hw,NULL );#undef RING_REG -MMIO_DH (GEN7_SC_INSTDONE ,D_BDW_PLUS , mmio_read_from_hw,NULL ); - -MMIO_GM_RDR (_MMIO (0x2148 ),D_ALL ,NULL ,NULL ); -MMIO_GM_RDR (CCID (RENDER_RING_BASE ),D_ALL ,NULL ,NULL ); -MMIO_GM_RDR (_MMIO (0x12198 ),D_ALL ,NULL ,NULL ); -MMIO_D (GEN7_CXT_SIZE ,D_ALL ); - -MMIO_RING_DFH (RING_TAIL ,D_ALL ,0 ,NULL ,NULL ); -MMIO_RING_DFH (RING_HEAD ,D_ALL ,0 ,NULL ,NULL ); -MMIO_RING_DFH (RING_CTL ,D_ALL ,0 ,NULL ,NULL ); -MMIO_RING_DFH (RING_ACTHD ,D_ALL ,0 , mmio_read_from_hw,NULL ); -MMIO_RING_GM (RING_START ,D_ALL ,NULL ,NULL ); +MMIO_H (GEN7_SC_INSTDONE ,D_BDW_PLUS , mmio_read_from_hw,NULL ); +MMIO_RING_H (RING_ACTHD ,D_ALL , mmio_read_from_hw,NULL );/* RING MODE */ #define RING_REG (base) _MMIO((base) + 0x29c) -MMIO_RING_DFH (RING_REG ,D_ALL , -F_MODE_MASK |F_CMD_ACCESS |F_CMD_WRITE_PATCH ,NULL , - ring_mode_mmio_write); +MMIO_RING_H (RING_REG ,D_ALL ,NULL , ring_mode_mmio_write);#undef RING_REG -MMIO_RING_DFH (RING_MI_MODE ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_RING_DFH (RING_INSTPM ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_RING_DFH (RING_TIMESTAMP ,D_ALL ,F_CMD_ACCESS , - mmio_read_from_hw,NULL ); -MMIO_RING_DFH (RING_TIMESTAMP_UDW ,D_ALL ,F_CMD_ACCESS , - mmio_read_from_hw,NULL ); - -MMIO_DFH (GEN7_GT_MODE ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (CACHE_MODE_0_GEN7 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_DFH (CACHE_MODE_1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (CACHE_MODE_0 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2124 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DFH (_MMIO (0x20dc ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_3D_CHICKEN3,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2088 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (FF_SLICE_CS_CHICKEN2 ,D_ALL , -F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2470 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GAM_ECOCHK ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GEN7_COMMON_SLICE_CHICKEN1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_DFH (COMMON_SLICE_CHICKEN2 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_DFH (_MMIO (0x9030 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x20a0 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2420 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2430 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2434 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2438 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x243c ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x7018 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (HALF_SLICE_CHICKEN3 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GEN7_HALF_SLICE_CHICKEN1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); - -/* display */ -MMIO_F (_MMIO (0x60220 ),0x20 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_D (_MMIO (0x602a0 ),D_ALL ); - -MMIO_D (_MMIO (0x65050 ),D_ALL ); -MMIO_D (_MMIO (0x650b4 ),D_ALL ); - -MMIO_D (_MMIO (0xc4040 ),D_ALL ); -MMIO_D (DERRMR ,D_ALL ); - -MMIO_D (PIPEDSL (PIPE_A ),D_ALL ); -MMIO_D (PIPEDSL (PIPE_B ),D_ALL ); -MMIO_D (PIPEDSL (PIPE_C ),D_ALL ); -MMIO_D (PIPEDSL (_PIPE_EDP),D_ALL ); - -MMIO_DH (PIPECONF (PIPE_A ),D_ALL ,NULL , pipeconf_mmio_write); -MMIO_DH (PIPECONF (PIPE_B ),D_ALL ,NULL , pipeconf_mmio_write); -MMIO_DH (PIPECONF (PIPE_C ),D_ALL ,NULL , pipeconf_mmio_write); -MMIO_DH (PIPECONF (_PIPE_EDP),D_ALL ,NULL , pipeconf_mmio_write); - -MMIO_D (PIPESTAT (PIPE_A ),D_ALL ); -MMIO_D (PIPESTAT (PIPE_B ),D_ALL ); -MMIO_D (PIPESTAT (PIPE_C ),D_ALL ); -MMIO_D (PIPESTAT (_PIPE_EDP),D_ALL ); - -MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_A ),D_ALL ); -MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_B ),D_ALL ); -MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_C ),D_ALL ); -MMIO_D (PIPE_FLIPCOUNT_G4X (_PIPE_EDP),D_ALL ); - -MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_A ),D_ALL ); -MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_B ),D_ALL ); -MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_C ),D_ALL ); -MMIO_D (PIPE_FRMCOUNT_G4X (_PIPE_EDP),D_ALL ); - -MMIO_D (CURCNTR (PIPE_A ),D_ALL ); -MMIO_D (CURCNTR (PIPE_B ),D_ALL ); -MMIO_D (CURCNTR (PIPE_C ),D_ALL ); - -MMIO_D (CURPOS (PIPE_A ),D_ALL ); -MMIO_D (CURPOS (PIPE_B ),D_ALL ); -MMIO_D (CURPOS (PIPE_C ),D_ALL ); - -MMIO_D (CURBASE (PIPE_A ),D_ALL ); -MMIO_D (CURBASE (PIPE_B ),D_ALL ); -MMIO_D (CURBASE (PIPE_C ),D_ALL ); - -MMIO_D (CUR_FBC_CTL (PIPE_A ),D_ALL ); -MMIO_D (CUR_FBC_CTL (PIPE_B ),D_ALL ); -MMIO_D (CUR_FBC_CTL (PIPE_C ),D_ALL ); - -MMIO_D (_MMIO (0x700ac ),D_ALL ); -MMIO_D (_MMIO (0x710ac ),D_ALL ); -MMIO_D (_MMIO (0x720ac ),D_ALL ); - -MMIO_D (_MMIO (0x70090 ),D_ALL ); -MMIO_D (_MMIO (0x70094 ),D_ALL ); -MMIO_D (_MMIO (0x70098 ),D_ALL ); -MMIO_D (_MMIO (0x7009c ),D_ALL ); - -MMIO_D (DSPCNTR (PIPE_A ),D_ALL ); -MMIO_D (DSPADDR (PIPE_A ),D_ALL ); -MMIO_D (DSPSTRIDE (PIPE_A ),D_ALL ); -MMIO_D (DSPPOS (PIPE_A ),D_ALL ); -MMIO_D (DSPSIZE (PIPE_A ),D_ALL ); -MMIO_DH (DSPSURF (PIPE_A ),D_ALL ,NULL , pri_surf_mmio_write); -MMIO_D (DSPOFFSET (PIPE_A ),D_ALL ); -MMIO_D (DSPSURFLIVE (PIPE_A ),D_ALL ); -MMIO_DH (REG_50080 (PIPE_A ,PLANE_PRIMARY ),D_ALL ,NULL , - reg50080_mmio_write); - -MMIO_D (DSPCNTR (PIPE_B ),D_ALL ); -MMIO_D (DSPADDR (PIPE_B ),D_ALL ); -MMIO_D (DSPSTRIDE (PIPE_B ),D_ALL ); -MMIO_D (DSPPOS (PIPE_B ),D_ALL ); -MMIO_D (DSPSIZE (PIPE_B ),D_ALL ); -MMIO_DH (DSPSURF (PIPE_B ),D_ALL ,NULL , pri_surf_mmio_write); -MMIO_D (DSPOFFSET (PIPE_B ),D_ALL ); -MMIO_D (DSPSURFLIVE (PIPE_B ),D_ALL ); -MMIO_DH (REG_50080 (PIPE_B ,PLANE_PRIMARY ),D_ALL ,NULL , - reg50080_mmio_write); - -MMIO_D (DSPCNTR (PIPE_C ),D_ALL ); -MMIO_D (DSPADDR (PIPE_C ),D_ALL ); -MMIO_D (DSPSTRIDE (PIPE_C ),D_ALL ); -MMIO_D (DSPPOS (PIPE_C ),D_ALL ); -MMIO_D (DSPSIZE (PIPE_C ),D_ALL ); -MMIO_DH (DSPSURF (PIPE_C ),D_ALL ,NULL , pri_surf_mmio_write); -MMIO_D (DSPOFFSET (PIPE_C ),D_ALL ); -MMIO_D (DSPSURFLIVE (PIPE_C ),D_ALL ); -MMIO_DH (REG_50080 (PIPE_C ,PLANE_PRIMARY ),D_ALL ,NULL , - reg50080_mmio_write); - -MMIO_D (SPRCTL (PIPE_A ),D_ALL ); -MMIO_D (SPRLINOFF (PIPE_A ),D_ALL ); -MMIO_D (SPRSTRIDE (PIPE_A ),D_ALL ); -MMIO_D (SPRPOS (PIPE_A ),D_ALL ); -MMIO_D (SPRSIZE (PIPE_A ),D_ALL ); -MMIO_D (SPRKEYVAL (PIPE_A ),D_ALL ); -MMIO_D (SPRKEYMSK (PIPE_A ),D_ALL ); -MMIO_DH (SPRSURF (PIPE_A ),D_ALL ,NULL , spr_surf_mmio_write); -MMIO_D (SPRKEYMAX (PIPE_A ),D_ALL ); -MMIO_D (SPROFFSET (PIPE_A ),D_ALL ); -MMIO_D (SPRSCALE (PIPE_A ),D_ALL ); -MMIO_D (SPRSURFLIVE (PIPE_A ),D_ALL ); -MMIO_DH (REG_50080 (PIPE_A ,PLANE_SPRITE0 ),D_ALL ,NULL , - reg50080_mmio_write); - -MMIO_D (SPRCTL (PIPE_B ),D_ALL ); -MMIO_D (SPRLINOFF (PIPE_B ),D_ALL ); -MMIO_D (SPRSTRIDE (PIPE_B ),D_ALL ); -MMIO_D (SPRPOS (PIPE_B ),D_ALL ); -MMIO_D (SPRSIZE (PIPE_B ),D_ALL ); -MMIO_D (SPRKEYVAL (PIPE_B ),D_ALL ); -MMIO_D (SPRKEYMSK (PIPE_B ),D_ALL ); -MMIO_DH (SPRSURF (PIPE_B ),D_ALL ,NULL , spr_surf_mmio_write); -MMIO_D (SPRKEYMAX (PIPE_B ),D_ALL ); -MMIO_D (SPROFFSET (PIPE_B ),D_ALL ); -MMIO_D (SPRSCALE (PIPE_B ),D_ALL ); -MMIO_D (SPRSURFLIVE (PIPE_B ),D_ALL ); -MMIO_DH (REG_50080 (PIPE_B ,PLANE_SPRITE0 ),D_ALL ,NULL , - reg50080_mmio_write); - -MMIO_D (SPRCTL (PIPE_C ),D_ALL ); -MMIO_D (SPRLINOFF (PIPE_C ),D_ALL ); -MMIO_D (SPRSTRIDE (PIPE_C ),D_ALL ); -MMIO_D (SPRPOS (PIPE_C ),D_ALL ); -MMIO_D (SPRSIZE (PIPE_C ),D_ALL ); -MMIO_D (SPRKEYVAL (PIPE_C ),D_ALL ); -MMIO_D (SPRKEYMSK (PIPE_C ),D_ALL ); -MMIO_DH (SPRSURF (PIPE_C ),D_ALL ,NULL , spr_surf_mmio_write); -MMIO_D (SPRKEYMAX (PIPE_C ),D_ALL ); -MMIO_D (SPROFFSET (PIPE_C ),D_ALL ); -MMIO_D (SPRSCALE (PIPE_C ),D_ALL ); -MMIO_D (SPRSURFLIVE (PIPE_C ),D_ALL ); -MMIO_DH (REG_50080 (PIPE_C ,PLANE_SPRITE0 ),D_ALL ,NULL , - reg50080_mmio_write); - -MMIO_D (HTOTAL (TRANSCODER_A ),D_ALL ); -MMIO_D (HBLANK (TRANSCODER_A ),D_ALL ); -MMIO_D (HSYNC (TRANSCODER_A ),D_ALL ); -MMIO_D (VTOTAL (TRANSCODER_A ),D_ALL ); -MMIO_D (VBLANK (TRANSCODER_A ),D_ALL ); -MMIO_D (VSYNC (TRANSCODER_A ),D_ALL ); -MMIO_D (BCLRPAT (TRANSCODER_A ),D_ALL ); -MMIO_D (VSYNCSHIFT (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPESRC (TRANSCODER_A ),D_ALL ); - -MMIO_D (HTOTAL (TRANSCODER_B ),D_ALL ); -MMIO_D (HBLANK (TRANSCODER_B ),D_ALL ); -MMIO_D (HSYNC (TRANSCODER_B ),D_ALL ); -MMIO_D (VTOTAL (TRANSCODER_B ),D_ALL ); -MMIO_D (VBLANK (TRANSCODER_B ),D_ALL ); -MMIO_D (VSYNC (TRANSCODER_B ),D_ALL ); -MMIO_D (BCLRPAT (TRANSCODER_B ),D_ALL ); -MMIO_D (VSYNCSHIFT (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPESRC (TRANSCODER_B ),D_ALL ); - -MMIO_D (HTOTAL (TRANSCODER_C ),D_ALL ); -MMIO_D (HBLANK (TRANSCODER_C ),D_ALL ); -MMIO_D (HSYNC (TRANSCODER_C ),D_ALL ); -MMIO_D (VTOTAL (TRANSCODER_C ),D_ALL ); -MMIO_D (VBLANK (TRANSCODER_C ),D_ALL ); -MMIO_D (VSYNC (TRANSCODER_C ),D_ALL ); -MMIO_D (BCLRPAT (TRANSCODER_C ),D_ALL ); -MMIO_D (VSYNCSHIFT (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPESRC (TRANSCODER_C ),D_ALL ); - -MMIO_D (HTOTAL (TRANSCODER_EDP ),D_ALL ); -MMIO_D (HBLANK (TRANSCODER_EDP ),D_ALL ); -MMIO_D (HSYNC (TRANSCODER_EDP ),D_ALL ); -MMIO_D (VTOTAL (TRANSCODER_EDP ),D_ALL ); -MMIO_D (VBLANK (TRANSCODER_EDP ),D_ALL ); -MMIO_D (VSYNC (TRANSCODER_EDP ),D_ALL ); -MMIO_D (BCLRPAT (TRANSCODER_EDP ),D_ALL ); -MMIO_D (VSYNCSHIFT (TRANSCODER_EDP ),D_ALL ); - -MMIO_D (PIPE_DATA_M1 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_DATA_N1 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_DATA_M2 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_DATA_N2 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_LINK_M1 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_LINK_N1 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_LINK_M2 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_LINK_N2 (TRANSCODER_A ),D_ALL ); - -MMIO_D (PIPE_DATA_M1 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_DATA_N1 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_DATA_M2 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_DATA_N2 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_LINK_M1 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_LINK_N1 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_LINK_M2 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_LINK_N2 (TRANSCODER_B ),D_ALL ); - -MMIO_D (PIPE_DATA_M1 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_DATA_N1 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_DATA_M2 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_DATA_N2 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_LINK_M1 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_LINK_N1 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_LINK_M2 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_LINK_N2 (TRANSCODER_C ),D_ALL ); - -MMIO_D (PIPE_DATA_M1 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_DATA_N1 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_DATA_M2 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_DATA_N2 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_LINK_M1 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_LINK_N1 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_LINK_M2 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_LINK_N2 (TRANSCODER_EDP ),D_ALL ); - -MMIO_D (PF_CTL (PIPE_A ),D_ALL ); -MMIO_D (PF_WIN_SZ (PIPE_A ),D_ALL ); -MMIO_D (PF_WIN_POS (PIPE_A ),D_ALL ); -MMIO_D (PF_VSCALE (PIPE_A ),D_ALL ); -MMIO_D (PF_HSCALE (PIPE_A ),D_ALL ); - -MMIO_D (PF_CTL (PIPE_B ),D_ALL ); -MMIO_D (PF_WIN_SZ (PIPE_B ),D_ALL ); -MMIO_D (PF_WIN_POS (PIPE_B ),D_ALL ); -MMIO_D (PF_VSCALE (PIPE_B ),D_ALL ); -MMIO_D (PF_HSCALE (PIPE_B ),D_ALL ); - -MMIO_D (PF_CTL (PIPE_C ),D_ALL ); -MMIO_D (PF_WIN_SZ (PIPE_C ),D_ALL ); -MMIO_D (PF_WIN_POS (PIPE_C ),D_ALL ); -MMIO_D (PF_VSCALE (PIPE_C ),D_ALL ); -MMIO_D (PF_HSCALE (PIPE_C ),D_ALL ); - -MMIO_D (WM0_PIPE_ILK (PIPE_A ),D_ALL ); -MMIO_D (WM0_PIPE_ILK (PIPE_B ),D_ALL ); -MMIO_D (WM0_PIPE_ILK (PIPE_C ),D_ALL ); -MMIO_D (WM1_LP_ILK ,D_ALL ); -MMIO_D (WM2_LP_ILK ,D_ALL ); -MMIO_D (WM3_LP_ILK ,D_ALL ); -MMIO_D (WM1S_LP_ILK ,D_ALL ); -MMIO_D (WM2S_LP_IVB ,D_ALL ); -MMIO_D (WM3S_LP_IVB ,D_ALL ); - -MMIO_D (BLC_PWM_CPU_CTL2 ,D_ALL ); -MMIO_D (BLC_PWM_CPU_CTL ,D_ALL ); -MMIO_D (BLC_PWM_PCH_CTL1 ,D_ALL ); -MMIO_D (BLC_PWM_PCH_CTL2 ,D_ALL ); - -MMIO_D (_MMIO (0x48268 ),D_ALL ); - -MMIO_F (PCH_GMBUS0 ,4 *4 ,0 ,0 ,0 ,D_ALL , gmbus_mmio_read, - gmbus_mmio_write); -MMIO_F (PCH_GPIO_BASE ,6 *4 ,F_UNALIGN ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0xe4f00 ),0x28 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_F (_MMIO (_PCH_DPB_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_PRE_SKL ,NULL , - dp_aux_ch_ctl_mmio_write); -MMIO_F (_MMIO (_PCH_DPC_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_PRE_SKL ,NULL , - dp_aux_ch_ctl_mmio_write); -MMIO_F (_MMIO (_PCH_DPD_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_PRE_SKL ,NULL , - dp_aux_ch_ctl_mmio_write); - -MMIO_DH (PCH_ADPA ,D_PRE_SKL ,NULL , pch_adpa_mmio_write); - -MMIO_DH (_MMIO (_PCH_TRANSACONF),D_ALL ,NULL , transconf_mmio_write); -MMIO_DH (_MMIO (_PCH_TRANSBCONF),D_ALL ,NULL , transconf_mmio_write); - -MMIO_DH (FDI_RX_IIR (PIPE_A ),D_ALL ,NULL , fdi_rx_iir_mmio_write); -MMIO_DH (FDI_RX_IIR (PIPE_B ),D_ALL ,NULL , fdi_rx_iir_mmio_write); -MMIO_DH (FDI_RX_IIR (PIPE_C ),D_ALL ,NULL , fdi_rx_iir_mmio_write); -MMIO_DH (FDI_RX_IMR (PIPE_A ),D_ALL ,NULL , update_fdi_rx_iir_status); -MMIO_DH (FDI_RX_IMR (PIPE_B ),D_ALL ,NULL , update_fdi_rx_iir_status); -MMIO_DH (FDI_RX_IMR (PIPE_C ),D_ALL ,NULL , update_fdi_rx_iir_status); -MMIO_DH (FDI_RX_CTL (PIPE_A ),D_ALL ,NULL , update_fdi_rx_iir_status); -MMIO_DH (FDI_RX_CTL (PIPE_B ),D_ALL ,NULL , update_fdi_rx_iir_status); -MMIO_DH (FDI_RX_CTL (PIPE_C ),D_ALL ,NULL , update_fdi_rx_iir_status); - -MMIO_D (_MMIO (_PCH_TRANS_HTOTAL_A),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_HBLANK_A),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_HSYNC_A),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VTOTAL_A),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VBLANK_A),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VSYNC_A),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VSYNCSHIFT_A),D_ALL ); - -MMIO_D (_MMIO (_PCH_TRANS_HTOTAL_B),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_HBLANK_B),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_HSYNC_B),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VTOTAL_B),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VBLANK_B),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VSYNC_B),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VSYNCSHIFT_B),D_ALL ); - -MMIO_D (_MMIO (_PCH_TRANSA_DATA_M1),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_DATA_N1),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_DATA_M2),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_DATA_N2),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_LINK_M1),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_LINK_N1),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_LINK_M2),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_LINK_N2),D_ALL ); - -MMIO_D (TRANS_DP_CTL (PIPE_A ),D_ALL ); -MMIO_D (TRANS_DP_CTL (PIPE_B ),D_ALL ); -MMIO_D (TRANS_DP_CTL (PIPE_C ),D_ALL ); - -MMIO_D (TVIDEO_DIP_CTL (PIPE_A ),D_ALL ); -MMIO_D (TVIDEO_DIP_DATA (PIPE_A ),D_ALL ); -MMIO_D (TVIDEO_DIP_GCP (PIPE_A ),D_ALL ); - -MMIO_D (TVIDEO_DIP_CTL (PIPE_B ),D_ALL ); -MMIO_D (TVIDEO_DIP_DATA (PIPE_B ),D_ALL ); -MMIO_D (TVIDEO_DIP_GCP (PIPE_B ),D_ALL ); - -MMIO_D (TVIDEO_DIP_CTL (PIPE_C ),D_ALL ); -MMIO_D (TVIDEO_DIP_DATA (PIPE_C ),D_ALL ); -MMIO_D (TVIDEO_DIP_GCP (PIPE_C ),D_ALL ); - -MMIO_D (_MMIO (_FDI_RXA_MISC),D_ALL ); -MMIO_D (_MMIO (_FDI_RXB_MISC),D_ALL ); -MMIO_D (_MMIO (_FDI_RXA_TUSIZE1),D_ALL ); -MMIO_D (_MMIO (_FDI_RXA_TUSIZE2),D_ALL ); -MMIO_D (_MMIO (_FDI_RXB_TUSIZE1),D_ALL ); -MMIO_D (_MMIO (_FDI_RXB_TUSIZE2),D_ALL ); - -MMIO_DH (PCH_PP_CONTROL ,D_ALL ,NULL , pch_pp_control_mmio_write); -MMIO_D (PCH_PP_DIVISOR ,D_ALL ); -MMIO_D (PCH_PP_STATUS ,D_ALL ); -MMIO_D (PCH_LVDS ,D_ALL ); -MMIO_D (_MMIO (_PCH_DPLL_A),D_ALL ); -MMIO_D (_MMIO (_PCH_DPLL_B),D_ALL ); -MMIO_D (_MMIO (_PCH_FPA0),D_ALL ); -MMIO_D (_MMIO (_PCH_FPA1),D_ALL ); -MMIO_D (_MMIO (_PCH_FPB0),D_ALL ); -MMIO_D (_MMIO (_PCH_FPB1),D_ALL ); -MMIO_D (PCH_DREF_CONTROL ,D_ALL ); -MMIO_D (PCH_RAWCLK_FREQ ,D_ALL ); -MMIO_D (PCH_DPLL_SEL ,D_ALL ); - -MMIO_D (_MMIO (0x61208 ),D_ALL ); -MMIO_D (_MMIO (0x6120c ),D_ALL ); -MMIO_D (PCH_PP_ON_DELAYS ,D_ALL ); -MMIO_D (PCH_PP_OFF_DELAYS ,D_ALL ); - -MMIO_DH (_MMIO (0xe651c ),D_ALL , dpy_reg_mmio_read,NULL ); -MMIO_DH (_MMIO (0xe661c ),D_ALL , dpy_reg_mmio_read,NULL ); -MMIO_DH (_MMIO (0xe671c ),D_ALL , dpy_reg_mmio_read,NULL ); -MMIO_DH (_MMIO (0xe681c ),D_ALL , dpy_reg_mmio_read,NULL ); -MMIO_DH (_MMIO (0xe6c04 ),D_ALL , dpy_reg_mmio_read,NULL ); -MMIO_DH (_MMIO (0xe6e1c ),D_ALL , dpy_reg_mmio_read,NULL ); - -MMIO_RO (PCH_PORT_HOTPLUG ,D_ALL ,0 , -PORTA_HOTPLUG_STATUS_MASK - |PORTB_HOTPLUG_STATUS_MASK - |PORTC_HOTPLUG_STATUS_MASK - |PORTD_HOTPLUG_STATUS_MASK , -NULL ,NULL ); - -MMIO_DH (LCPLL_CTL ,D_ALL ,NULL , lcpll_ctl_mmio_write); -MMIO_D (FUSE_STRAP ,D_ALL ); -MMIO_D (DIGITAL_PORT_HOTPLUG_CNTRL ,D_ALL ); - -MMIO_D (DISP_ARB_CTL ,D_ALL ); -MMIO_D (DISP_ARB_CTL2 ,D_ALL ); - -MMIO_D (ILK_DISPLAY_CHICKEN1 ,D_ALL ); -MMIO_D (ILK_DISPLAY_CHICKEN2 ,D_ALL ); -MMIO_D (ILK_DSPCLK_GATE_D ,D_ALL ); - -MMIO_D (SOUTH_CHICKEN1 ,D_ALL ); -MMIO_DH (SOUTH_CHICKEN2 ,D_ALL ,NULL , south_chicken2_mmio_write); -MMIO_D (_MMIO (_TRANSA_CHICKEN1),D_ALL ); -MMIO_D (_MMIO (_TRANSB_CHICKEN1),D_ALL ); -MMIO_D (SOUTH_DSPCLK_GATE_D ,D_ALL ); -MMIO_D (_MMIO (_TRANSA_CHICKEN2),D_ALL ); -MMIO_D (_MMIO (_TRANSB_CHICKEN2),D_ALL ); - -MMIO_D (ILK_DPFC_CB_BASE (INTEL_FBC_A ),D_ALL ); -MMIO_D (ILK_DPFC_CONTROL (INTEL_FBC_A ),D_ALL ); -MMIO_D (ILK_DPFC_RECOMP_CTL (INTEL_FBC_A ),D_ALL ); -MMIO_D (ILK_DPFC_STATUS (INTEL_FBC_A ),D_ALL ); -MMIO_D (ILK_DPFC_FENCE_YOFF (INTEL_FBC_A ),D_ALL ); -MMIO_D (ILK_DPFC_CHICKEN (INTEL_FBC_A ),D_ALL ); -MMIO_D (ILK_FBC_RT_BASE ,D_ALL ); - -MMIO_D (IPS_CTL ,D_ALL ); - -MMIO_D (PIPE_CSC_COEFF_RY_GY (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BY (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_RU_GU (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BU (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_RV_GV (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BV (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_MODE (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_HI (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_ME (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_LO (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_HI (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_ME (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_LO (PIPE_A ),D_ALL ); - -MMIO_D (PIPE_CSC_COEFF_RY_GY (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BY (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_RU_GU (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BU (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_RV_GV (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BV (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_MODE (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_HI (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_ME (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_LO (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_HI (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_ME (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_LO (PIPE_B ),D_ALL ); - -MMIO_D (PIPE_CSC_COEFF_RY_GY (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BY (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_RU_GU (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BU (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_RV_GV (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BV (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_MODE (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_HI (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_ME (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_LO (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_HI (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_ME (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_LO (PIPE_C ),D_ALL ); - -MMIO_D (PREC_PAL_INDEX (PIPE_A ),D_ALL ); -MMIO_D (PREC_PAL_DATA (PIPE_A ),D_ALL ); -MMIO_F (PREC_PAL_GC_MAX (PIPE_A ,0 ),4 *3 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_D (PREC_PAL_INDEX (PIPE_B ),D_ALL ); -MMIO_D (PREC_PAL_DATA (PIPE_B ),D_ALL ); -MMIO_F (PREC_PAL_GC_MAX (PIPE_B ,0 ),4 *3 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_D (PREC_PAL_INDEX (PIPE_C ),D_ALL ); -MMIO_D (PREC_PAL_DATA (PIPE_C ),D_ALL ); -MMIO_F (PREC_PAL_GC_MAX (PIPE_C ,0 ),4 *3 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_D (_MMIO (0x60110 ),D_ALL ); -MMIO_D (_MMIO (0x61110 ),D_ALL ); -MMIO_F (_MMIO (0x70400 ),0x40 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x71400 ),0x40 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x72400 ),0x40 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x70440 ),0xc ,0 ,0 ,0 ,D_PRE_SKL ,NULL ,NULL ); -MMIO_F (_MMIO (0x71440 ),0xc ,0 ,0 ,0 ,D_PRE_SKL ,NULL ,NULL ); -MMIO_F (_MMIO (0x72440 ),0xc ,0 ,0 ,0 ,D_PRE_SKL ,NULL ,NULL ); -MMIO_F (_MMIO (0x7044c ),0xc ,0 ,0 ,0 ,D_PRE_SKL ,NULL ,NULL ); -MMIO_F (_MMIO (0x7144c ),0xc ,0 ,0 ,0 ,D_PRE_SKL ,NULL ,NULL ); -MMIO_F (_MMIO (0x7244c ),0xc ,0 ,0 ,0 ,D_PRE_SKL ,NULL ,NULL ); - -MMIO_D (WM_LINETIME (PIPE_A ),D_ALL ); -MMIO_D (WM_LINETIME (PIPE_B ),D_ALL ); -MMIO_D (WM_LINETIME (PIPE_C ),D_ALL ); -MMIO_D (SPLL_CTL ,D_ALL ); -MMIO_D (_MMIO (_WRPLL_CTL1),D_ALL ); -MMIO_D (_MMIO (_WRPLL_CTL2),D_ALL ); -MMIO_D (PORT_CLK_SEL (PORT_A ),D_ALL ); -MMIO_D (PORT_CLK_SEL (PORT_B ),D_ALL ); -MMIO_D (PORT_CLK_SEL (PORT_C ),D_ALL ); -MMIO_D (PORT_CLK_SEL (PORT_D ),D_ALL ); -MMIO_D (PORT_CLK_SEL (PORT_E ),D_ALL ); -MMIO_D (TRANS_CLK_SEL (TRANSCODER_A ),D_ALL ); -MMIO_D (TRANS_CLK_SEL (TRANSCODER_B ),D_ALL ); -MMIO_D (TRANS_CLK_SEL (TRANSCODER_C ),D_ALL ); - -MMIO_D (HSW_NDE_RSTWRN_OPT ,D_ALL ); -MMIO_D (_MMIO (0x46508 ),D_ALL ); - -MMIO_D (_MMIO (0x49080 ),D_ALL ); -MMIO_D (_MMIO (0x49180 ),D_ALL ); -MMIO_D (_MMIO (0x49280 ),D_ALL ); - -MMIO_F (_MMIO (0x49090 ),0x14 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x49190 ),0x14 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x49290 ),0x14 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_D (GAMMA_MODE (PIPE_A ),D_ALL ); -MMIO_D (GAMMA_MODE (PIPE_B ),D_ALL ); -MMIO_D (GAMMA_MODE (PIPE_C ),D_ALL ); - -MMIO_D (PIPE_MULT (PIPE_A ),D_ALL ); -MMIO_D (PIPE_MULT (PIPE_B ),D_ALL ); -MMIO_D (PIPE_MULT (PIPE_C ),D_ALL ); - -MMIO_D (HSW_TVIDEO_DIP_CTL (TRANSCODER_A ),D_ALL ); -MMIO_D (HSW_TVIDEO_DIP_CTL (TRANSCODER_B ),D_ALL ); -MMIO_D (HSW_TVIDEO_DIP_CTL (TRANSCODER_C ),D_ALL ); - -MMIO_DH (SFUSE_STRAP ,D_ALL ,NULL ,NULL ); -MMIO_D (SBI_ADDR ,D_ALL ); -MMIO_DH (SBI_DATA ,D_ALL , sbi_data_mmio_read,NULL ); -MMIO_DH (SBI_CTL_STAT ,D_ALL ,NULL , sbi_ctl_mmio_write); -MMIO_D (PIXCLK_GATE ,D_ALL ); - -MMIO_F (_MMIO (_DPA_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_ALL ,NULL , - dp_aux_ch_ctl_mmio_write); - -MMIO_DH (DDI_BUF_CTL (PORT_A ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); -MMIO_DH (DDI_BUF_CTL (PORT_B ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); -MMIO_DH (DDI_BUF_CTL (PORT_C ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); -MMIO_DH (DDI_BUF_CTL (PORT_D ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); -MMIO_DH (DDI_BUF_CTL (PORT_E ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); - -MMIO_DH (DP_TP_CTL (PORT_A ),D_ALL ,NULL , dp_tp_ctl_mmio_write); -MMIO_DH (DP_TP_CTL (PORT_B ),D_ALL ,NULL , dp_tp_ctl_mmio_write); -MMIO_DH (DP_TP_CTL (PORT_C ),D_ALL ,NULL , dp_tp_ctl_mmio_write); -MMIO_DH (DP_TP_CTL (PORT_D ),D_ALL ,NULL , dp_tp_ctl_mmio_write); -MMIO_DH (DP_TP_CTL (PORT_E ),D_ALL ,NULL , dp_tp_ctl_mmio_write); - -MMIO_DH (DP_TP_STATUS (PORT_A ),D_ALL ,NULL , dp_tp_status_mmio_write); -MMIO_DH (DP_TP_STATUS (PORT_B ),D_ALL ,NULL , dp_tp_status_mmio_write); -MMIO_DH (DP_TP_STATUS (PORT_C ),D_ALL ,NULL , dp_tp_status_mmio_write); -MMIO_DH (DP_TP_STATUS (PORT_D ),D_ALL ,NULL , dp_tp_status_mmio_write); -MMIO_DH (DP_TP_STATUS (PORT_E ),D_ALL ,NULL ,NULL ); - -MMIO_F (_MMIO (_DDI_BUF_TRANS_A),0x50 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x64e60 ),0x50 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x64eC0 ),0x50 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x64f20 ),0x50 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x64f80 ),0x50 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_D (HSW_AUD_CFG (PIPE_A ),D_ALL ); -MMIO_D (HSW_AUD_PIN_ELD_CP_VLD ,D_ALL ); -MMIO_D (HSW_AUD_MISC_CTRL (PIPE_A ),D_ALL ); - -MMIO_DH (_MMIO (_TRANS_DDI_FUNC_CTL_A),D_ALL ,NULL ,NULL ); -MMIO_DH (_MMIO (_TRANS_DDI_FUNC_CTL_B),D_ALL ,NULL ,NULL ); -MMIO_DH (_MMIO (_TRANS_DDI_FUNC_CTL_C),D_ALL ,NULL ,NULL ); -MMIO_DH (_MMIO (_TRANS_DDI_FUNC_CTL_EDP),D_ALL ,NULL ,NULL ); - -MMIO_D (_MMIO (_TRANSA_MSA_MISC),D_ALL ); -MMIO_D (_MMIO (_TRANSB_MSA_MISC),D_ALL ); -MMIO_D (_MMIO (_TRANSC_MSA_MISC),D_ALL ); -MMIO_D (_MMIO (_TRANS_EDP_MSA_MISC),D_ALL ); - -MMIO_DH (FORCEWAKE ,D_ALL ,NULL ,NULL ); -MMIO_D (FORCEWAKE_ACK ,D_ALL ); -MMIO_D (GEN6_GT_CORE_STATUS ,D_ALL ); -MMIO_D (GEN6_GT_THREAD_STATUS_REG ,D_ALL ); -MMIO_DFH (GTFIFODBG ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GTFIFOCTL ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DH (FORCEWAKE_MT ,D_PRE_SKL ,NULL , mul_force_wake_write); -MMIO_DH (FORCEWAKE_ACK_HSW ,D_BDW ,NULL ,NULL ); -MMIO_D (ECOBUS ,D_ALL ); -MMIO_DH (GEN6_RC_CONTROL ,D_ALL ,NULL ,NULL ); -MMIO_DH (GEN6_RC_STATE ,D_ALL ,NULL ,NULL ); -MMIO_D (GEN6_RPNSWREQ ,D_ALL ); -MMIO_D (GEN6_RC_VIDEO_FREQ ,D_ALL ); -MMIO_D (GEN6_RP_DOWN_TIMEOUT ,D_ALL ); -MMIO_D (GEN6_RP_INTERRUPT_LIMITS ,D_ALL ); -MMIO_D (GEN6_RPSTAT1 ,D_ALL ); -MMIO_D (GEN6_RP_CONTROL ,D_ALL ); -MMIO_D (GEN6_RP_UP_THRESHOLD ,D_ALL ); -MMIO_D (GEN6_RP_DOWN_THRESHOLD ,D_ALL ); -MMIO_D (GEN6_RP_CUR_UP_EI ,D_ALL ); -MMIO_D (GEN6_RP_CUR_UP ,D_ALL ); -MMIO_D (GEN6_RP_PREV_UP ,D_ALL ); -MMIO_D (GEN6_RP_CUR_DOWN_EI ,D_ALL ); -MMIO_D (GEN6_RP_CUR_DOWN ,D_ALL ); -MMIO_D (GEN6_RP_PREV_DOWN ,D_ALL ); -MMIO_D (GEN6_RP_UP_EI ,D_ALL ); -MMIO_D (GEN6_RP_DOWN_EI ,D_ALL ); -MMIO_D (GEN6_RP_IDLE_HYSTERSIS ,D_ALL ); -MMIO_D (GEN6_RC1_WAKE_RATE_LIMIT ,D_ALL ); -MMIO_D (GEN6_RC6_WAKE_RATE_LIMIT ,D_ALL ); -MMIO_D (GEN6_RC6pp_WAKE_RATE_LIMIT,D_ALL ); -MMIO_D (GEN6_RC_EVALUATION_INTERVAL ,D_ALL ); -MMIO_D (GEN6_RC_IDLE_HYSTERSIS ,D_ALL ); -MMIO_D (GEN6_RC_SLEEP ,D_ALL ); -MMIO_D (GEN6_RC1e_THRESHOLD,D_ALL ); -MMIO_D (GEN6_RC6_THRESHOLD ,D_ALL ); -MMIO_D (GEN6_RC6p_THRESHOLD,D_ALL ); -MMIO_D (GEN6_RC6pp_THRESHOLD,D_ALL ); -MMIO_D (GEN6_PMINTRMSK ,D_ALL ); -MMIO_DH (HSW_PWR_WELL_CTL1 ,D_BDW ,NULL , power_well_ctl_mmio_write); -MMIO_DH (HSW_PWR_WELL_CTL2 ,D_BDW ,NULL , power_well_ctl_mmio_write); -MMIO_DH (HSW_PWR_WELL_CTL3 ,D_BDW ,NULL , power_well_ctl_mmio_write); -MMIO_DH (HSW_PWR_WELL_CTL4 ,D_BDW ,NULL , power_well_ctl_mmio_write); -MMIO_DH (HSW_PWR_WELL_CTL5 ,D_BDW ,NULL , power_well_ctl_mmio_write); -MMIO_DH (HSW_PWR_WELL_CTL6 ,D_BDW ,NULL , power_well_ctl_mmio_write); - -MMIO_D (RSTDBYCTL ,D_ALL ); - -MMIO_DH (GEN6_GDRST ,D_ALL ,NULL , gdrst_mmio_write); -MMIO_F (FENCE_REG_GEN6_LO (0 ),0x80 ,0 ,0 ,0 ,D_ALL , fence_mmio_read, fence_mmio_write); -MMIO_DH (CPU_VGACNTRL ,D_ALL ,NULL , vga_control_mmio_write); - -MMIO_D (TILECTL ,D_ALL ); - -MMIO_D (GEN6_UCGCTL1 ,D_ALL ); -MMIO_D (GEN6_UCGCTL2 ,D_ALL ); - -MMIO_F (_MMIO (0x4f000 ),0x90 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_D (GEN6_PCODE_DATA ,D_ALL ); -MMIO_D (_MMIO (0x13812c ),D_ALL ); -MMIO_DH (GEN7_ERR_INT ,D_ALL ,NULL ,NULL ); -MMIO_D (HSW_EDRAM_CAP ,D_ALL ); -MMIO_D (HSW_IDICR ,D_ALL ); -MMIO_DH (GFX_FLSH_CNTL_GEN6 ,D_ALL ,NULL ,NULL ); - -MMIO_D (_MMIO (0x3c ),D_ALL ); -MMIO_D (_MMIO (0x860 ),D_ALL ); -MMIO_D (ECOSKPD (RENDER_RING_BASE ),D_ALL ); -MMIO_D (_MMIO (0x121d0 ),D_ALL ); -MMIO_D (ECOSKPD (BLT_RING_BASE ),D_ALL ); -MMIO_D (_MMIO (0x41d0 ),D_ALL ); -MMIO_D (GAC_ECO_BITS ,D_ALL ); -MMIO_D (_MMIO (0x6200 ),D_ALL ); -MMIO_D (_MMIO (0x6204 ),D_ALL ); -MMIO_D (_MMIO (0x6208 ),D_ALL ); -MMIO_D (_MMIO (0x7118 ),D_ALL ); -MMIO_D (_MMIO (0x7180 ),D_ALL ); -MMIO_D (_MMIO (0x7408 ),D_ALL ); -MMIO_D (_MMIO (0x7c00 ),D_ALL ); -MMIO_DH (GEN6_MBCTL ,D_ALL ,NULL , mbctl_write); -MMIO_D (_MMIO (0x911c ),D_ALL ); -MMIO_D (_MMIO (0x9120 ),D_ALL ); -MMIO_DFH (GEN7_UCGCTL4 ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_D (GAB_CTL ,D_ALL ); -MMIO_D (_MMIO (0x48800 ),D_ALL ); -MMIO_D (_MMIO (0xce044 ),D_ALL ); -MMIO_D (_MMIO (0xe6500 ),D_ALL ); -MMIO_D (_MMIO (0xe6504 ),D_ALL ); -MMIO_D (_MMIO (0xe6600 ),D_ALL ); -MMIO_D (_MMIO (0xe6604 ),D_ALL ); -MMIO_D (_MMIO (0xe6700 ),D_ALL ); -MMIO_D (_MMIO (0xe6704 ),D_ALL ); -MMIO_D (_MMIO (0xe6800 ),D_ALL ); -MMIO_D (_MMIO (0xe6804 ),D_ALL ); -MMIO_D (PCH_GMBUS4 ,D_ALL ); -MMIO_D (PCH_GMBUS5 ,D_ALL ); - -MMIO_D (_MMIO (0x902c ),D_ALL ); -MMIO_D (_MMIO (0xec008 ),D_ALL ); -MMIO_D (_MMIO (0xec00c ),D_ALL ); -MMIO_D (_MMIO (0xec008 +0x18 ),D_ALL ); -MMIO_D (_MMIO (0xec00c +0x18 ),D_ALL ); -MMIO_D (_MMIO (0xec008 +0x18 *2 ),D_ALL ); -MMIO_D (_MMIO (0xec00c +0x18 *2 ),D_ALL ); -MMIO_D (_MMIO (0xec008 +0x18 *3 ),D_ALL ); -MMIO_D (_MMIO (0xec00c +0x18 *3 ),D_ALL ); -MMIO_D (_MMIO (0xec408 ),D_ALL ); -MMIO_D (_MMIO (0xec40c ),D_ALL ); -MMIO_D (_MMIO (0xec408 +0x18 ),D_ALL ); -MMIO_D (_MMIO (0xec40c +0x18 ),D_ALL ); -MMIO_D (_MMIO (0xec408 +0x18 *2 ),D_ALL ); -MMIO_D (_MMIO (0xec40c +0x18 *2 ),D_ALL ); -MMIO_D (_MMIO (0xec408 +0x18 *3 ),D_ALL ); -MMIO_D (_MMIO (0xec40c +0x18 *3 ),D_ALL ); -MMIO_D (_MMIO (0xfc810 ),D_ALL ); -MMIO_D (_MMIO (0xfc81c ),D_ALL ); -MMIO_D (_MMIO (0xfc828 ),D_ALL ); -MMIO_D (_MMIO (0xfc834 ),D_ALL ); -MMIO_D (_MMIO (0xfcc00 ),D_ALL ); -MMIO_D (_MMIO (0xfcc0c ),D_ALL ); -MMIO_D (_MMIO (0xfcc18 ),D_ALL ); -MMIO_D (_MMIO (0xfcc24 ),D_ALL ); -MMIO_D (_MMIO (0xfd000 ),D_ALL ); -MMIO_D (_MMIO (0xfd00c ),D_ALL ); -MMIO_D (_MMIO (0xfd018 ),D_ALL ); -MMIO_D (_MMIO (0xfd024 ),D_ALL ); -MMIO_D (_MMIO (0xfd034 ),D_ALL ); - -MMIO_DH (FPGA_DBG ,D_ALL ,NULL , fpga_dbg_mmio_write); -MMIO_D (_MMIO (0x2054 ),D_ALL ); -MMIO_D (_MMIO (0x12054 ),D_ALL ); -MMIO_D (_MMIO (0x22054 ),D_ALL ); -MMIO_D (_MMIO (0x1a054 ),D_ALL ); - -MMIO_D (_MMIO (0x44070 ),D_ALL ); -MMIO_DFH (_MMIO (0x215c ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2178 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x217c ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x12178 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x1217c ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_F (_MMIO (0x2290 ),8 ,F_CMD_ACCESS ,0 ,0 ,D_BDW_PLUS ,NULL ,NULL ); -MMIO_D (_MMIO (0x2b00 ),D_BDW_PLUS ); -MMIO_D (_MMIO (0x2360 ),D_BDW_PLUS ); -MMIO_F (_MMIO (0x5200 ),32 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x5240 ),32 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x5280 ),16 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_DFH (_MMIO (0x1c17c ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x1c178 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (BCS_SWCTRL ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_F (HS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (DS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (IA_VERTICES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (IA_PRIMITIVES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (VS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (GS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (GS_PRIMITIVES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (CL_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (CL_PRIMITIVES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (PS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (PS_DEPTH_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_DH (_MMIO (0x4260 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); -MMIO_DH (_MMIO (0x4264 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); -MMIO_DH (_MMIO (0x4268 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); -MMIO_DH (_MMIO (0x426c ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); -MMIO_DH (_MMIO (0x4270 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); -MMIO_DFH (_MMIO (0x4094 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DFH (ARB_MODE ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_RING_GM (RING_BBADDR ,D_ALL ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2220 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x12220 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x22220 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_RING_DFH (RING_SYNC_1 ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_RING_DFH (RING_SYNC_0 ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x22178 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x1a178 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x1a17c ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2217c ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DH (EDP_PSR_IMR ,D_BDW_PLUS ,NULL , edp_psr_imr_iir_write); -MMIO_DH (EDP_PSR_IIR ,D_BDW_PLUS ,NULL , edp_psr_imr_iir_write); -MMIO_DH (GUC_STATUS ,D_ALL , guc_status_read,NULL ); - -return 0 ; -} - -static int init_bdw_mmio_info (struct intel_gvt *gvt) +MMIO_RING_H (RING_TIMESTAMP ,D_ALL , mmio_read_from_hw,NULL ); +MMIO_RING_H (RING_TIMESTAMP_UDW ,D_ALL , mmio_read_from_hw,NULL ); +MMIO_H (PIPECONF (PIPE_A ),D_ALL ,NULL , pipeconf_mmio_write); +MMIO_H (PIPECONF (PIPE_B ),D_ALL ,NULL , pipeconf_mmio_write); +MMIO_H (PIPECONF (PIPE_C ),D_ALL ,NULL , pipeconf_mmio_write); +MMIO_H (PIPECONF (_PIPE_EDP),D_ALL ,NULL , pipeconf_mmio_write); +MMIO_H (DSPSURF (PIPE_A ),D_ALL ,NULL , pri_surf_mmio_write); +MMIO_H (REG_50080 (PIPE_A ,PLANE_PRIMARY ),D_ALL ,NULL , reg50080_mmio_write); +MMIO_H (DSPSURF (PIPE_B ),D_ALL ,NULL , pri_surf_mmio_write); +MMIO_H (REG_50080 (PIPE_B ,PLANE_PRIMARY ),D_ALL ,NULL , reg50080_mmio_write); +MMIO_H (DSPSURF (PIPE_C ),D_ALL ,NULL , pri_surf_mmio_write); +MMIO_H (REG_50080 (PIPE_C ,PLANE_PRIMARY ),D_ALL ,NULL , reg50080_mmio_write); +MMIO_H (SPRSURF (PIPE_A ),D_ALL ,NULL , spr_surf_mmio_write); +MMIO_H (REG_50080 (PIPE_A ,PLANE_SPRITE0 ),D_ALL ,NULL , reg50080_mmio_write); +MMIO_H (SPRSURF (PIPE_B ),D_ALL ,NULL , spr_surf_mmio_write); +MMIO_H (REG_50080 (PIPE_B ,PLANE_SPRITE0 ),D_ALL ,NULL , reg50080_mmio_write); +MMIO_H (SPRSURF (PIPE_C ),D_ALL ,NULL , spr_surf_mmio_write); +MMIO_H (REG_50080 (PIPE_C ,PLANE_SPRITE0 ),D_ALL ,NULL , reg50080_mmio_write); +MMIO_F (PCH_GMBUS0 ,4 *4 ,D_ALL , gmbus_mmio_read, gmbus_mmio_write); +MMIO_F (_MMIO (_PCH_DPB_AUX_CH_CTL),6 *4 ,D_PRE_SKL ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_F (_MMIO (_PCH_DPC_AUX_CH_CTL),6 *4 ,D_PRE_SKL ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_F (_MMIO (_PCH_DPD_AUX_CH_CTL),6 *4 ,D_PRE_SKL ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_H (PCH_ADPA ,D_PRE_SKL ,NULL , pch_adpa_mmio_write); +MMIO_H (_MMIO (_PCH_TRANSACONF),D_ALL ,NULL , transconf_mmio_write); +MMIO_H (_MMIO (_PCH_TRANSBCONF),D_ALL ,NULL , transconf_mmio_write); +MMIO_H (FDI_RX_IIR (PIPE_A ),D_ALL ,NULL , fdi_rx_iir_mmio_write); +MMIO_H (FDI_RX_IIR (PIPE_B ),D_ALL ,NULL , fdi_rx_iir_mmio_write); +MMIO_H (FDI_RX_IIR (PIPE_C ),D_ALL ,NULL , fdi_rx_iir_mmio_write); +MMIO_H (FDI_RX_IMR (PIPE_A ),D_ALL ,NULL , update_fdi_rx_iir_status); +MMIO_H (FDI_RX_IMR (PIPE_B ),D_ALL ,NULL , update_fdi_rx_iir_status); +MMIO_H (FDI_RX_IMR (PIPE_C ),D_ALL ,NULL , update_fdi_rx_iir_status); +MMIO_H (FDI_RX_CTL (PIPE_A ),D_ALL ,NULL , update_fdi_rx_iir_status); +MMIO_H (FDI_RX_CTL (PIPE_B ),D_ALL ,NULL , update_fdi_rx_iir_status); +MMIO_H (FDI_RX_CTL (PIPE_C ),D_ALL ,NULL , update_fdi_rx_iir_status); +MMIO_H (PCH_PP_CONTROL ,D_ALL ,NULL , pch_pp_control_mmio_write); +MMIO_H (_MMIO (0xe651c ),D_ALL , dpy_reg_mmio_read,NULL ); +MMIO_H (_MMIO (0xe661c ),D_ALL , dpy_reg_mmio_read,NULL ); +MMIO_H (_MMIO (0xe671c ),D_ALL , dpy_reg_mmio_read,NULL ); +MMIO_H (_MMIO (0xe681c ),D_ALL , dpy_reg_mmio_read,NULL ); +MMIO_H (_MMIO (0xe6c04 ),D_ALL , dpy_reg_mmio_read,NULL ); +MMIO_H (_MMIO (0xe6e1c ),D_ALL , dpy_reg_mmio_read,NULL ); +MMIO_H (LCPLL_CTL ,D_ALL ,NULL , lcpll_ctl_mmio_write); +MMIO_H (SOUTH_CHICKEN2 ,D_ALL ,NULL , south_chicken2_mmio_write); +MMIO_H (SBI_DATA ,D_ALL , sbi_data_mmio_read,NULL ); +MMIO_H (SBI_CTL_STAT ,D_ALL ,NULL , sbi_ctl_mmio_write); +MMIO_F (_MMIO (_DPA_AUX_CH_CTL),6 *4 ,D_ALL ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_H (DDI_BUF_CTL (PORT_A ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); +MMIO_H (DDI_BUF_CTL (PORT_B ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); +MMIO_H (DDI_BUF_CTL (PORT_C ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); +MMIO_H (DDI_BUF_CTL (PORT_D ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); +MMIO_H (DDI_BUF_CTL (PORT_E ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); +MMIO_H (DP_TP_CTL (PORT_A ),D_ALL ,NULL , dp_tp_ctl_mmio_write); +MMIO_H (DP_TP_CTL (PORT_B ),D_ALL ,NULL , dp_tp_ctl_mmio_write); +MMIO_H (DP_TP_CTL (PORT_C ),D_ALL ,NULL , dp_tp_ctl_mmio_write); +MMIO_H (DP_TP_CTL (PORT_D ),D_ALL ,NULL , dp_tp_ctl_mmio_write); +MMIO_H (DP_TP_CTL (PORT_E ),D_ALL ,NULL , dp_tp_ctl_mmio_write); +MMIO_H (DP_TP_STATUS (PORT_A ),D_ALL ,NULL , dp_tp_status_mmio_write); +MMIO_H (DP_TP_STATUS (PORT_B ),D_ALL ,NULL , dp_tp_status_mmio_write); +MMIO_H (DP_TP_STATUS (PORT_C ),D_ALL ,NULL , dp_tp_status_mmio_write); +MMIO_H (DP_TP_STATUS (PORT_D ),D_ALL ,NULL , dp_tp_status_mmio_write); +MMIO_H (FORCEWAKE_MT ,D_PRE_SKL ,NULL , mul_force_wake_write); +MMIO_H (HSW_PWR_WELL_CTL1 ,D_BDW ,NULL , power_well_ctl_mmio_write); +MMIO_H (HSW_PWR_WELL_CTL2 ,D_BDW ,NULL , power_well_ctl_mmio_write); +MMIO_H (HSW_PWR_WELL_CTL3 ,D_BDW ,NULL , power_well_ctl_mmio_write); +MMIO_H (HSW_PWR_WELL_CTL4 ,D_BDW ,NULL , power_well_ctl_mmio_write); +MMIO_H (HSW_PWR_WELL_CTL5 ,D_BDW ,NULL , power_well_ctl_mmio_write); +MMIO_H (HSW_PWR_WELL_CTL6 ,D_BDW ,NULL , power_well_ctl_mmio_write); +MMIO_H (GEN6_GDRST ,D_ALL ,NULL , gdrst_mmio_write); +MMIO_F (FENCE_REG_GEN6_LO (0 ),0x80 ,D_ALL , fence_mmio_read, fence_mmio_write); +MMIO_H (CPU_VGACNTRL ,D_ALL ,NULL , vga_control_mmio_write); +MMIO_H (GEN6_MBCTL ,D_ALL ,NULL , mbctl_write); +MMIO_H (FPGA_DBG ,D_ALL ,NULL , fpga_dbg_mmio_write); +MMIO_H (_MMIO (0x4260 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); +MMIO_H (_MMIO (0x4264 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); +MMIO_H (_MMIO (0x4268 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); +MMIO_H (_MMIO (0x426c ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); +MMIO_H (_MMIO (0x4270 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); +MMIO_H (EDP_PSR_IMR ,D_BDW_PLUS ,NULL , edp_psr_imr_iir_write); +MMIO_H (EDP_PSR_IIR ,D_BDW_PLUS ,NULL , edp_psr_imr_iir_write); +MMIO_H (GUC_STATUS ,D_ALL , guc_status_read,NULL ); + +return 0 ; +} + +static int init_bdw_mmio_handlers (struct intel_gvt *gvt) { -struct drm_i915_private *dev_priv = gvt->gt->i915;int ret; -MMIO_DH (GEN8_GT_IMR (0 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_GT_IER (0 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_GT_IIR (0 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_GT_ISR (0 ),D_BDW_PLUS ); - -MMIO_DH (GEN8_GT_IMR (1 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_GT_IER (1 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_GT_IIR (1 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_GT_ISR (1 ),D_BDW_PLUS ); - -MMIO_DH (GEN8_GT_IMR (2 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_GT_IER (2 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_GT_IIR (2 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_GT_ISR (2 ),D_BDW_PLUS ); - -MMIO_DH (GEN8_GT_IMR (3 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_GT_IER (3 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_GT_IIR (3 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_GT_ISR (3 ),D_BDW_PLUS ); - -MMIO_DH (GEN8_DE_PIPE_IMR (PIPE_A ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_DE_PIPE_IER (PIPE_A ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_DE_PIPE_IIR (PIPE_A ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_DE_PIPE_ISR (PIPE_A ),D_BDW_PLUS ); - -MMIO_DH (GEN8_DE_PIPE_IMR (PIPE_B ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_DE_PIPE_IER (PIPE_B ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_DE_PIPE_IIR (PIPE_B ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_DE_PIPE_ISR (PIPE_B ),D_BDW_PLUS ); - -MMIO_DH (GEN8_DE_PIPE_IMR (PIPE_C ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_DE_PIPE_IER (PIPE_C ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_DE_PIPE_IIR (PIPE_C ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_DE_PIPE_ISR (PIPE_C ),D_BDW_PLUS ); - -MMIO_DH (GEN8_DE_PORT_IMR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_DE_PORT_IER ,D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_DE_PORT_IIR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_DE_PORT_ISR ,D_BDW_PLUS ); - -MMIO_DH (GEN8_DE_MISC_IMR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_DE_MISC_IER ,D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_DE_MISC_IIR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_DE_MISC_ISR ,D_BDW_PLUS ); - -MMIO_DH (GEN8_PCU_IMR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_PCU_IER ,D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_PCU_IIR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_PCU_ISR ,D_BDW_PLUS ); - -MMIO_DH (GEN8_MASTER_IRQ ,D_BDW_PLUS ,NULL , - intel_vgpu_reg_master_irq_handler); - -MMIO_RING_DFH (RING_ACTHD_UDW ,D_BDW_PLUS ,0 , - mmio_read_from_hw,NULL ); +MMIO_H (GEN8_GT_IMR (0 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_GT_IER (0 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_GT_IIR (0 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_GT_IMR (1 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_GT_IER (1 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_GT_IIR (1 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_GT_IMR (2 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_GT_IER (2 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_GT_IIR (2 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_GT_IMR (3 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_GT_IER (3 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_GT_IIR (3 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_DE_PIPE_IMR (PIPE_A ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_DE_PIPE_IER (PIPE_A ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_DE_PIPE_IIR (PIPE_A ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_DE_PIPE_IMR (PIPE_B ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_DE_PIPE_IER (PIPE_B ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_DE_PIPE_IIR (PIPE_B ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_DE_PIPE_IMR (PIPE_C ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_DE_PIPE_IER (PIPE_C ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_DE_PIPE_IIR (PIPE_C ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_DE_PORT_IMR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_DE_PORT_IER ,D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_DE_PORT_IIR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_DE_MISC_IMR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_DE_MISC_IER ,D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_DE_MISC_IIR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_PCU_IMR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_PCU_IER ,D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_PCU_IIR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_MASTER_IRQ ,D_BDW_PLUS ,NULL , intel_vgpu_reg_master_irq_handler); +MMIO_RING_H (RING_ACTHD_UDW ,D_BDW_PLUS , mmio_read_from_hw,NULL );#define RING_REG (base) _MMIO((base) + 0xd0) -MMIO_RING_F (RING_REG ,4 ,F_RO ,0 , - ~_MASKED_BIT_ENABLE (RESET_CTL_REQUEST_RESET ),D_BDW_PLUS ,NULL , - ring_reset_ctl_write); +MMIO_RING_F (RING_REG ,4 ,D_BDW_PLUS ,NULL , ring_reset_ctl_write);#undef RING_REG#define RING_REG (base) _MMIO((base) + 0x230) -MMIO_RING_DFH (RING_REG ,D_BDW_PLUS ,0 ,NULL , elsp_mmio_write); -#undef RING_REG - -#define RING_REG (base) _MMIO((base) + 0x234) -MMIO_RING_F (RING_REG ,8 ,F_RO ,0 , ~0 ,D_BDW_PLUS , -NULL ,NULL ); -#undef RING_REG - -#define RING_REG (base) _MMIO((base) + 0x244) -MMIO_RING_DFH (RING_REG ,D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -#undef RING_REG - -#define RING_REG (base) _MMIO((base) + 0x370) -MMIO_RING_F (RING_REG ,48 ,F_RO ,0 , ~0 ,D_BDW_PLUS ,NULL ,NULL ); +MMIO_RING_H (RING_REG ,D_BDW_PLUS ,NULL , elsp_mmio_write);#undef RING_REG -#define RING_REG (base) _MMIO((base) + 0x3a0) -MMIO_RING_DFH (RING_REG ,D_BDW_PLUS ,F_MODE_MASK ,NULL ,NULL ); -#undef RING_REG - -MMIO_D (PIPEMISC (PIPE_A ),D_BDW_PLUS ); -MMIO_D (PIPEMISC (PIPE_B ),D_BDW_PLUS ); -MMIO_D (PIPEMISC (PIPE_C ),D_BDW_PLUS ); -MMIO_D (_MMIO (0x1c1d0 ),D_BDW_PLUS ); -MMIO_D (GEN6_MBCUNIT_SNPCR ,D_BDW_PLUS ); -MMIO_D (GEN7_MISCCPCTL ,D_BDW_PLUS ); -MMIO_D (_MMIO (0x1c054 ),D_BDW_PLUS ); - -MMIO_DH (GEN6_PCODE_MAILBOX ,D_BDW_PLUS ,NULL , mailbox_write); - -MMIO_D (GEN8_PRIVATE_PAT_LO ,D_BDW_PLUS & ~D_BXT ); -MMIO_D (GEN8_PRIVATE_PAT_HI ,D_BDW_PLUS ); - -MMIO_D (GAMTARBMODE ,D_BDW_PLUS ); - -#define RING_REG (base) _MMIO((base) + 0x270) -MMIO_RING_F (RING_REG ,32 ,F_CMD_ACCESS ,0 ,0 ,D_BDW_PLUS ,NULL ,NULL ); -#undef RING_REG - -MMIO_RING_GM (RING_HWS_PGA ,D_BDW_PLUS ,NULL , hws_pga_write); - -MMIO_DFH (HDC_CHICKEN0 ,D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_D (CHICKEN_PIPESL_1 (PIPE_A ),D_BDW_PLUS ); -MMIO_D (CHICKEN_PIPESL_1 (PIPE_B ),D_BDW_PLUS ); -MMIO_D (CHICKEN_PIPESL_1 (PIPE_C ),D_BDW_PLUS ); - -MMIO_D (WM_MISC ,D_BDW ); -MMIO_D (_MMIO (_SRD_CTL_EDP),D_BDW ); - -MMIO_D (_MMIO (0x6671c ),D_BDW_PLUS ); -MMIO_D (_MMIO (0x66c00 ),D_BDW_PLUS ); -MMIO_D (_MMIO (0x66c04 ),D_BDW_PLUS ); - -MMIO_D (HSW_GTT_CACHE_EN ,D_BDW_PLUS ); - -MMIO_D (GEN8_EU_DISABLE0 ,D_BDW_PLUS ); -MMIO_D (GEN8_EU_DISABLE1 ,D_BDW_PLUS ); -MMIO_D (GEN8_EU_DISABLE2 ,D_BDW_PLUS ); - -MMIO_D (_MMIO (0xfdc ),D_BDW_PLUS ); -MMIO_DFH (GEN8_ROW_CHICKEN ,D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_DFH (GEN7_ROW_CHICKEN2 ,D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_DFH (GEN8_UCGCTL6 ,D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DFH (_MMIO (0xb1f0 ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xb1c0 ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GEN8_L3SQCREG4 ,D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xb100 ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xb10c ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_D (_MMIO (0xb110 ),D_BDW ); -MMIO_D (GEN9_SCRATCH_LNCF1 ,D_BDW_PLUS ); - -MMIO_F (_MMIO (0x24d0 ),48 ,F_CMD_ACCESS |F_CMD_WRITE_PATCH ,0 ,0 , -D_BDW_PLUS ,NULL , force_nonpriv_write); - -MMIO_D (_MMIO (0x44484 ),D_BDW_PLUS ); -MMIO_D (_MMIO (0x4448c ),D_BDW_PLUS ); - -MMIO_DFH (_MMIO (0x83a4 ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_D (GEN8_L3_LRA_1_GPGPU ,D_BDW_PLUS ); - -MMIO_DFH (_MMIO (0x8430 ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_D (_MMIO (0x110000 ),D_BDW_PLUS ); +MMIO_H (GEN6_PCODE_MAILBOX ,D_BDW_PLUS ,NULL , mailbox_write); +MMIO_RING_H (RING_HWS_PGA ,D_BDW_PLUS ,NULL , hws_pga_write); +MMIO_F (_MMIO (0x24d0 ),48 ,D_BDW_PLUS ,NULL , force_nonpriv_write); -MMIO_D (_MMIO (0x48400 ),D_BDW_PLUS ); - -MMIO_D (_MMIO (0x6e570 ),D_BDW_PLUS ); -MMIO_D (_MMIO (0x65f10 ),D_BDW_PLUS ); - -MMIO_DFH (_MMIO (0xe194 ),D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe188 ),D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (HALF_SLICE_CHICKEN2 ,D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2580 ),D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DFH (_MMIO (0x2248 ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DFH (_MMIO (0xe220 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe230 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe240 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe260 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe270 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe280 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe2a0 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe2b0 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe2c0 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x21f0 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL );return 0 ; } -static int init_skl_mmio_info (struct intel_gvt *gvt) +static int init_skl_mmio_handlers (struct intel_gvt *gvt) {struct drm_i915_private *dev_priv = gvt->gt->i915;int ret; -MMIO_DH (FORCEWAKE_RENDER_GEN9 ,D_SKL_PLUS ,NULL , mul_force_wake_write); -MMIO_DH (FORCEWAKE_ACK_RENDER_GEN9 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (FORCEWAKE_GT_GEN9 ,D_SKL_PLUS ,NULL , mul_force_wake_write); -MMIO_DH (FORCEWAKE_ACK_GT_GEN9 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (FORCEWAKE_MEDIA_GEN9 ,D_SKL_PLUS ,NULL , mul_force_wake_write); -MMIO_DH (FORCEWAKE_ACK_MEDIA_GEN9 ,D_SKL_PLUS ,NULL ,NULL ); - -MMIO_F (DP_AUX_CH_CTL (AUX_CH_B ),6 *4 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL , - dp_aux_ch_ctl_mmio_write); -MMIO_F (DP_AUX_CH_CTL (AUX_CH_C ),6 *4 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL , - dp_aux_ch_ctl_mmio_write); -MMIO_F (DP_AUX_CH_CTL (AUX_CH_D ),6 *4 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL , - dp_aux_ch_ctl_mmio_write); - -MMIO_D (HSW_PWR_WELL_CTL1 ,D_SKL_PLUS ); -MMIO_DH (HSW_PWR_WELL_CTL2 ,D_SKL_PLUS ,NULL , skl_power_well_ctl_write); - -MMIO_DH (DBUF_CTL_S (0 ),D_SKL_PLUS ,NULL , gen9_dbuf_ctl_mmio_write); - -MMIO_D (GEN9_PG_ENABLE ,D_SKL_PLUS ); -MMIO_D (GEN9_MEDIA_PG_IDLE_HYSTERESIS ,D_SKL_PLUS ); -MMIO_D (GEN9_RENDER_PG_IDLE_HYSTERESIS ,D_SKL_PLUS ); -MMIO_DFH (GEN9_GAMT_ECO_REG_RW_IA ,D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (MMCD_MISC_CTRL ,D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DH (CHICKEN_PAR1_1 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_D (DC_STATE_EN ,D_SKL_PLUS ); -MMIO_D (DC_STATE_DEBUG ,D_SKL_PLUS ); -MMIO_D (CDCLK_CTL ,D_SKL_PLUS ); -MMIO_DH (LCPLL1_CTL ,D_SKL_PLUS ,NULL , skl_lcpll_write); -MMIO_DH (LCPLL2_CTL ,D_SKL_PLUS ,NULL , skl_lcpll_write); -MMIO_D (_MMIO (_DPLL1_CFGCR1),D_SKL_PLUS ); -MMIO_D (_MMIO (_DPLL2_CFGCR1),D_SKL_PLUS ); -MMIO_D (_MMIO (_DPLL3_CFGCR1),D_SKL_PLUS ); -MMIO_D (_MMIO (_DPLL1_CFGCR2),D_SKL_PLUS ); -MMIO_D (_MMIO (_DPLL2_CFGCR2),D_SKL_PLUS ); -MMIO_D (_MMIO (_DPLL3_CFGCR2),D_SKL_PLUS ); -MMIO_D (DPLL_CTRL1 ,D_SKL_PLUS ); -MMIO_D (DPLL_CTRL2 ,D_SKL_PLUS ); -MMIO_DH (DPLL_STATUS ,D_SKL_PLUS , dpll_status_read,NULL ); - -MMIO_DH (SKL_PS_WIN_POS (PIPE_A ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_POS (PIPE_A ,1 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_POS (PIPE_B ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_POS (PIPE_B ,1 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_POS (PIPE_C ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_POS (PIPE_C ,1 ),D_SKL_PLUS ,NULL , pf_write); - -MMIO_DH (SKL_PS_WIN_SZ (PIPE_A ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_SZ (PIPE_A ,1 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_SZ (PIPE_B ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_SZ (PIPE_B ,1 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_SZ (PIPE_C ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_SZ (PIPE_C ,1 ),D_SKL_PLUS ,NULL , pf_write); - -MMIO_DH (SKL_PS_CTRL (PIPE_A ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_CTRL (PIPE_A ,1 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_CTRL (PIPE_B ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_CTRL (PIPE_B ,1 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_CTRL (PIPE_C ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_CTRL (PIPE_C ,1 ),D_SKL_PLUS ,NULL , pf_write); - -MMIO_DH (PLANE_BUF_CFG (PIPE_A ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_A ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_A ,2 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_A ,3 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_BUF_CFG (PIPE_B ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_B ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_B ,2 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_B ,3 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_BUF_CFG (PIPE_C ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_C ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_C ,2 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_C ,3 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (CUR_BUF_CFG (PIPE_A ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (CUR_BUF_CFG (PIPE_B ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (CUR_BUF_CFG (PIPE_C ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_F (PLANE_WM (PIPE_A ,0 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (PLANE_WM (PIPE_A ,1 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (PLANE_WM (PIPE_A ,2 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); - -MMIO_F (PLANE_WM (PIPE_B ,0 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (PLANE_WM (PIPE_B ,1 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (PLANE_WM (PIPE_B ,2 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); - -MMIO_F (PLANE_WM (PIPE_C ,0 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (PLANE_WM (PIPE_C ,1 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (PLANE_WM (PIPE_C ,2 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); - -MMIO_F (CUR_WM (PIPE_A ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (CUR_WM (PIPE_B ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (CUR_WM (PIPE_C ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_WM_TRANS (PIPE_A ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_WM_TRANS (PIPE_A ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_WM_TRANS (PIPE_A ,2 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_WM_TRANS (PIPE_B ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_WM_TRANS (PIPE_B ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_WM_TRANS (PIPE_B ,2 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_WM_TRANS (PIPE_C ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_WM_TRANS (PIPE_C ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_WM_TRANS (PIPE_C ,2 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (CUR_WM_TRANS (PIPE_A ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (CUR_WM_TRANS (PIPE_B ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (CUR_WM_TRANS (PIPE_C ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_A ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_A ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_A ,2 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_A ,3 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_B ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_B ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_B ,2 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_B ,3 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_C ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_C ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_C ,2 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_C ,3 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (_MMIO (_REG_701C0 (PIPE_A ,1 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_A ,2 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_A ,3 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_A ,4 )),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (_MMIO (_REG_701C0 (PIPE_B ,1 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_B ,2 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_B ,3 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_B ,4 )),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (_MMIO (_REG_701C0 (PIPE_C ,1 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_C ,2 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_C ,3 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_C ,4 )),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (_MMIO (_REG_701C4 (PIPE_A ,1 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_A ,2 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_A ,3 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_A ,4 )),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (_MMIO (_REG_701C4 (PIPE_B ,1 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_B ,2 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_B ,3 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_B ,4 )),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (_MMIO (_REG_701C4 (PIPE_C ,1 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_C ,2 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_C ,3 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_C ,4 )),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_D (_MMIO (_PLANE_CTL_3_A),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_CTL_3_B),D_SKL_PLUS ); -MMIO_D (_MMIO (0x72380 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x7239c ),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_SURF_3_A),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_SURF_3_B),D_SKL_PLUS ); - -MMIO_D (DMC_SSP_BASE ,D_SKL_PLUS ); -MMIO_D (DMC_HTP_SKL ,D_SKL_PLUS ); -MMIO_D (DMC_LAST_WRITE ,D_SKL_PLUS ); - -MMIO_DFH (BDW_SCRATCH1 ,D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_D (SKL_DFSM ,D_SKL_PLUS ); -MMIO_D (DISPIO_CR_TX_BMU_CR0 ,D_SKL_PLUS ); - -MMIO_F (GEN9_GFX_MOCS (0 ),0x7f8 ,F_CMD_ACCESS ,0 ,0 ,D_SKL_PLUS , -NULL ,NULL ); -MMIO_F (GEN7_L3CNTLREG2 ,0x80 ,F_CMD_ACCESS ,0 ,0 ,D_SKL_PLUS , -NULL ,NULL ); - -MMIO_D (RPM_CONFIG0 ,D_SKL_PLUS ); -MMIO_D (_MMIO (0xd08 ),D_SKL_PLUS ); -MMIO_D (RC6_LOCATION ,D_SKL_PLUS ); -MMIO_DFH (GEN7_FF_SLICE_CS_CHICKEN1 ,D_SKL_PLUS , -F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GEN9_CS_DEBUG_MODE1 ,D_SKL_PLUS ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); - -/* TRTT */ -MMIO_DFH (TRVATTL3PTRDW (0 ),D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (TRVATTL3PTRDW (1 ),D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (TRVATTL3PTRDW (2 ),D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (TRVATTL3PTRDW (3 ),D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (TRVADR ,D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (TRTTE ,D_SKL_PLUS ,F_CMD_ACCESS |F_PM_SAVE , -NULL , gen9_trtte_write); -MMIO_DFH (_MMIO (0x4dfc ),D_SKL_PLUS ,F_PM_SAVE , -NULL , gen9_trtt_chicken_write); - -MMIO_D (_MMIO (0x46430 ),D_SKL_PLUS ); - -MMIO_D (_MMIO (0x46520 ),D_SKL_PLUS ); - -MMIO_D (_MMIO (0xc403c ),D_SKL_PLUS ); -MMIO_DFH (GEN8_GARBCNTL ,D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DH (DMA_CTRL ,D_SKL_PLUS ,NULL , dma_ctrl_write); - -MMIO_D (_MMIO (0x65900 ),D_SKL_PLUS ); -MMIO_D (GEN6_STOLEN_RESERVED ,D_SKL_PLUS ); -MMIO_D (_MMIO (0x4068 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x67054 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x6e560 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x6e554 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x2b20 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x65f00 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x65f08 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x320f0 ),D_SKL_PLUS ); - -MMIO_D (_MMIO (0x70034 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x71034 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x72034 ),D_SKL_PLUS ); - -MMIO_D (_MMIO (_PLANE_KEYVAL_1 (PIPE_A )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYVAL_1 (PIPE_B )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYVAL_1 (PIPE_C )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYMAX_1 (PIPE_A )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYMAX_1 (PIPE_B )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYMAX_1 (PIPE_C )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYMSK_1 (PIPE_A )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYMSK_1 (PIPE_B )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYMSK_1 (PIPE_C )),D_SKL_PLUS ); - -MMIO_D (_MMIO (0x44500 ),D_SKL_PLUS ); +MMIO_H (FORCEWAKE_RENDER_GEN9 ,D_SKL_PLUS ,NULL , mul_force_wake_write); +MMIO_H (FORCEWAKE_GT_GEN9 ,D_SKL_PLUS ,NULL , mul_force_wake_write); +MMIO_H (FORCEWAKE_MEDIA_GEN9 ,D_SKL_PLUS ,NULL , mul_force_wake_write); +MMIO_F (DP_AUX_CH_CTL (AUX_CH_B ),6 *4 ,D_SKL_PLUS ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_F (DP_AUX_CH_CTL (AUX_CH_C ),6 *4 ,D_SKL_PLUS ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_F (DP_AUX_CH_CTL (AUX_CH_D ),6 *4 ,D_SKL_PLUS ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_H (HSW_PWR_WELL_CTL2 ,D_SKL_PLUS ,NULL , skl_power_well_ctl_write); +MMIO_H (DBUF_CTL_S (0 ),D_SKL_PLUS ,NULL , gen9_dbuf_ctl_mmio_write); +MMIO_H (LCPLL1_CTL ,D_SKL_PLUS ,NULL , skl_lcpll_write); +MMIO_H (LCPLL2_CTL ,D_SKL_PLUS ,NULL , skl_lcpll_write); +MMIO_H (DPLL_STATUS ,D_SKL_PLUS , dpll_status_read,NULL ); +MMIO_H (SKL_PS_WIN_POS (PIPE_A ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_POS (PIPE_A ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_POS (PIPE_B ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_POS (PIPE_B ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_POS (PIPE_C ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_POS (PIPE_C ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_SZ (PIPE_A ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_SZ (PIPE_A ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_SZ (PIPE_B ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_SZ (PIPE_B ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_SZ (PIPE_C ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_SZ (PIPE_C ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_CTRL (PIPE_A ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_CTRL (PIPE_A ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_CTRL (PIPE_B ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_CTRL (PIPE_B ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_CTRL (PIPE_C ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_CTRL (PIPE_C ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (TRTTE ,D_SKL_PLUS ,NULL , gen9_trtte_write); +MMIO_H (_MMIO (0x4dfc ),D_SKL_PLUS ,NULL , gen9_trtt_chicken_write); +MMIO_H (DMA_CTRL ,D_SKL_PLUS ,NULL , dma_ctrl_write); +#define CSFE_CHICKEN1_REG (base) _MMIO((base) + 0xD4) -MMIO_RING_DFH (CSFE_CHICKEN1_REG ,D_SKL_PLUS ,F_MODE_MASK |F_CMD_ACCESS , -NULL , csfe_chicken1_mmio_write); +MMIO_RING_H (CSFE_CHICKEN1_REG ,D_SKL_PLUS ,NULL , csfe_chicken1_mmio_write);#undef CSFE_CHICKEN1_REG -MMIO_DFH (GEN8_HDC_CHICKEN1 ,D_SKL_PLUS ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_DFH (GEN9_WM_CHICKEN3 ,D_SKL_PLUS ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); - -MMIO_DFH (GAMT_CHKN_BIT_REG ,D_KBL |D_CFL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_D (GEN9_CTX_PREEMPT_REG ,D_SKL_PLUS & ~D_BXT ); -MMIO_DFH (_MMIO (0xe4cc ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL );return 0 ; } -static int init_bxt_mmio_info (struct intel_gvt *gvt) +static int init_bxt_mmio_handlers (struct intel_gvt *gvt) { -struct drm_i915_private *dev_priv = gvt->gt->i915;int ret; -MMIO_F (_MMIO (0x80000 ),0x3000 ,0 ,0 ,0 ,D_BXT ,NULL ,NULL ); - -MMIO_D (GEN7_SAMPLER_INSTDONE ,D_BXT ); -MMIO_D (GEN7_ROW_INSTDONE ,D_BXT ); -MMIO_D (GEN8_FAULT_TLB_DATA0 ,D_BXT ); -MMIO_D (GEN8_FAULT_TLB_DATA1 ,D_BXT ); -MMIO_D (ERROR_GEN6 ,D_BXT ); -MMIO_D (DONE_REG ,D_BXT ); -MMIO_D (EIR ,D_BXT ); -MMIO_D (PGTBL_ER ,D_BXT ); -MMIO_D (_MMIO (0x4194 ),D_BXT ); -MMIO_D (_MMIO (0x4294 ),D_BXT ); -MMIO_D (_MMIO (0x4494 ),D_BXT ); - -MMIO_RING_D (RING_PSMI_CTL ,D_BXT ); -MMIO_RING_D (RING_DMA_FADD ,D_BXT ); -MMIO_RING_D (RING_DMA_FADD_UDW ,D_BXT ); -MMIO_RING_D (RING_IPEHR ,D_BXT ); -MMIO_RING_D (RING_INSTPS ,D_BXT ); -MMIO_RING_D (RING_BBADDR_UDW ,D_BXT ); -MMIO_RING_D (RING_BBSTATE ,D_BXT ); -MMIO_RING_D (RING_IPEIR ,D_BXT ); - -MMIO_F (SOFT_SCRATCH (0 ),16 *4 ,0 ,0 ,0 ,D_BXT ,NULL ,NULL ); - -MMIO_DH (BXT_P_CR_GT_DISP_PWRON ,D_BXT ,NULL , bxt_gt_disp_pwron_write); -MMIO_D (BXT_RP_STATE_CAP ,D_BXT ); -MMIO_DH (BXT_PHY_CTL_FAMILY (DPIO_PHY0 ),D_BXT , -NULL , bxt_phy_ctl_family_write); -MMIO_DH (BXT_PHY_CTL_FAMILY (DPIO_PHY1 ),D_BXT , -NULL , bxt_phy_ctl_family_write); -MMIO_D (BXT_PHY_CTL (PORT_A ),D_BXT ); -MMIO_D (BXT_PHY_CTL (PORT_B ),D_BXT ); -MMIO_D (BXT_PHY_CTL (PORT_C ),D_BXT ); -MMIO_DH (BXT_PORT_PLL_ENABLE (PORT_A ),D_BXT , -NULL , bxt_port_pll_enable_write); -MMIO_DH (BXT_PORT_PLL_ENABLE (PORT_B ),D_BXT , -NULL , bxt_port_pll_enable_write); -MMIO_DH (BXT_PORT_PLL_ENABLE (PORT_C ),D_BXT ,NULL , - bxt_port_pll_enable_write); - -MMIO_D (BXT_PORT_CL1CM_DW0 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW9 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW10 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW28 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW30 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_CL2CM_DW6 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_REF_DW3 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_REF_DW6 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_REF_DW8 (DPIO_PHY0 ),D_BXT ); - -MMIO_D (BXT_PORT_CL1CM_DW0 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW9 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW10 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW28 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW30 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_CL2CM_DW6 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_REF_DW3 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_REF_DW6 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_REF_DW8 (DPIO_PHY1 ),D_BXT ); - -MMIO_D (BXT_PORT_PLL_EBB_0 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PLL_EBB_4 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW10_LN01 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW10_GRP (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW12_LN01 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW12_LN23 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_DH (BXT_PORT_PCS_DW12_GRP (DPIO_PHY0 ,DPIO_CH0 ),D_BXT , -NULL , bxt_pcs_dw12_grp_write); -MMIO_D (BXT_PORT_TX_DW2_LN0 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW2_GRP (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_DH (BXT_PORT_TX_DW3_LN0 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT , - bxt_port_tx_dw3_read,NULL ); -MMIO_D (BXT_PORT_TX_DW3_GRP (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW4_LN0 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW4_GRP (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH0 ,0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH0 ,1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH0 ,2 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH0 ,3 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,0 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,1 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,2 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,3 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,6 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,8 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,9 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,10 ),D_BXT ); - -MMIO_D (BXT_PORT_PLL_EBB_0 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_PLL_EBB_4 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW10_LN01 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW10_GRP (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW12_LN01 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW12_LN23 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_DH (BXT_PORT_PCS_DW12_GRP (DPIO_PHY0 ,DPIO_CH1 ),D_BXT , -NULL , bxt_pcs_dw12_grp_write); -MMIO_D (BXT_PORT_TX_DW2_LN0 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW2_GRP (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_DH (BXT_PORT_TX_DW3_LN0 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT , - bxt_port_tx_dw3_read,NULL ); -MMIO_D (BXT_PORT_TX_DW3_GRP (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW4_LN0 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW4_GRP (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH1 ,0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH1 ,1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH1 ,2 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH1 ,3 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,0 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,1 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,2 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,3 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,6 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,8 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,9 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,10 ),D_BXT ); - -MMIO_D (BXT_PORT_PLL_EBB_0 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PLL_EBB_4 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW10_LN01 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW10_GRP (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW12_LN01 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW12_LN23 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_DH (BXT_PORT_PCS_DW12_GRP (DPIO_PHY1 ,DPIO_CH0 ),D_BXT , -NULL , bxt_pcs_dw12_grp_write); -MMIO_D (BXT_PORT_TX_DW2_LN0 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW2_GRP (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_DH (BXT_PORT_TX_DW3_LN0 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT , - bxt_port_tx_dw3_read,NULL ); -MMIO_D (BXT_PORT_TX_DW3_GRP (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW4_LN0 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW4_GRP (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY1 ,DPIO_CH0 ,0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY1 ,DPIO_CH0 ,1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY1 ,DPIO_CH0 ,2 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY1 ,DPIO_CH0 ,3 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,0 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,1 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,2 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,3 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,6 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,8 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,9 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,10 ),D_BXT ); - -MMIO_D (BXT_DE_PLL_CTL ,D_BXT ); -MMIO_DH (BXT_DE_PLL_ENABLE ,D_BXT ,NULL , bxt_de_pll_enable_write); -MMIO_D (BXT_DSI_PLL_CTL ,D_BXT ); -MMIO_D (BXT_DSI_PLL_ENABLE ,D_BXT ); - -MMIO_D (GEN9_CLKGATE_DIS_0 ,D_BXT ); -MMIO_D (GEN9_CLKGATE_DIS_4 ,D_BXT ); - -MMIO_D (HSW_TVIDEO_DIP_GCP (TRANSCODER_A ),D_BXT ); -MMIO_D (HSW_TVIDEO_DIP_GCP (TRANSCODER_B ),D_BXT ); -MMIO_D (HSW_TVIDEO_DIP_GCP (TRANSCODER_C ),D_BXT ); - -MMIO_D (RC6_CTX_BASE ,D_BXT ); - -MMIO_D (GEN8_PUSHBUS_CONTROL ,D_BXT ); -MMIO_D (GEN8_PUSHBUS_ENABLE ,D_BXT ); -MMIO_D (GEN8_PUSHBUS_SHIFT ,D_BXT ); -MMIO_D (GEN6_GFXPAUSE ,D_BXT ); -MMIO_DFH (GEN8_L3SQCREG1 ,D_BXT ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GEN8_L3CNTLREG ,D_BXT ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x20D8 ),D_BXT ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_F (GEN8_RING_CS_GPR (RENDER_RING_BASE ,0 ),0x40 ,F_CMD_ACCESS , -0 ,0 ,D_BXT ,NULL ,NULL ); -MMIO_F (GEN8_RING_CS_GPR (GEN6_BSD_RING_BASE ,0 ),0x40 ,F_CMD_ACCESS , -0 ,0 ,D_BXT ,NULL ,NULL ); -MMIO_F (GEN8_RING_CS_GPR (BLT_RING_BASE ,0 ),0x40 ,F_CMD_ACCESS , -0 ,0 ,D_BXT ,NULL ,NULL ); -MMIO_F (GEN8_RING_CS_GPR (VEBOX_RING_BASE ,0 ),0x40 ,F_CMD_ACCESS , -0 ,0 ,D_BXT ,NULL ,NULL ); - -MMIO_DFH (GEN9_CTX_PREEMPT_REG ,D_BXT ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DH (GEN8_PRIVATE_PAT_LO ,D_BXT ,NULL , bxt_ppat_low_write); - -return 0 ; -} - -static const struct gvt_mmio_block *find_mmio_block (struct intel_gvt *gvt, +MMIO_H (BXT_P_CR_GT_DISP_PWRON ,D_BXT ,NULL , bxt_gt_disp_pwron_write); +MMIO_H (BXT_PHY_CTL_FAMILY (DPIO_PHY0 ),D_BXT ,NULL , bxt_phy_ctl_family_write); +MMIO_H (BXT_PHY_CTL_FAMILY (DPIO_PHY1 ),D_BXT ,NULL , bxt_phy_ctl_family_write); +MMIO_H (BXT_PORT_PLL_ENABLE (PORT_A ),D_BXT ,NULL , bxt_port_pll_enable_write); +MMIO_H (BXT_PORT_PLL_ENABLE (PORT_B ),D_BXT ,NULL , bxt_port_pll_enable_write); +MMIO_H (BXT_PORT_PLL_ENABLE (PORT_C ),D_BXT ,NULL , bxt_port_pll_enable_write); +MMIO_H (BXT_PORT_PCS_DW12_GRP (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ,NULL , bxt_pcs_dw12_grp_write); +MMIO_H (BXT_PORT_TX_DW3_LN0 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT , bxt_port_tx_dw3_read,NULL ); +MMIO_H (BXT_PORT_PCS_DW12_GRP (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ,NULL , bxt_pcs_dw12_grp_write); +MMIO_H (BXT_PORT_TX_DW3_LN0 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT , bxt_port_tx_dw3_read,NULL ); +MMIO_H (BXT_PORT_PCS_DW12_GRP (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ,NULL , bxt_pcs_dw12_grp_write); +MMIO_H (BXT_PORT_TX_DW3_LN0 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT , bxt_port_tx_dw3_read,NULL ); +MMIO_H (BXT_DE_PLL_ENABLE ,D_BXT ,NULL , bxt_de_pll_enable_write); +MMIO_H (GEN8_PRIVATE_PAT_LO ,D_BXT ,NULL , bxt_ppat_low_write); + +return 0 ; +} + +static struct intel_gvt_mmio_block *find_mmio_block (struct intel_gvt *gvt,unsigned int offset) { -unsigned long device =intel_gvt_get_device_type (gvt); -const struct gvt_mmio_block *block = gvt->mmio.mmio_block; +unsigned long device =intel_gvt_get_device_type (gvt->gt->i915); +struct intel_gvt_mmio_block *block = gvt->mmio.mmio_block;int num = gvt->mmio.num_mmio_block;int i;for (i =0 ; i < num; i++, block++) {if (!(device & block->device))continue ; -if (offset >=i915_mmio_reg_offset (block->offset) && - offset <i915_mmio_reg_offset (block->offset) + block->size) +if (offset >= block->offset && + offset < block->offset + block->size)return block; }return NULL ;@@ -3664,23 +2370,110 @@ void intel_gvt_clean_mmio_info(struct intel_gvt *gvt)hash_for_each_safe (gvt->mmio.mmio_info_table, i, tmp, e, node)kfree (e); +kfree (gvt->mmio.mmio_block); + gvt->mmio.mmio_block =NULL ; + gvt->mmio.num_mmio_block =0 ; +vfree (gvt->mmio.mmio_attribute); gvt->mmio.mmio_attribute =NULL ; } -/* Special MMIO blocks. registers in MMIO block ranges should not be command -* accessible (should have no F_CMD_ACCESS flag). -* otherwise, need to update cmd_reg_handler in cmd_parser.c -*/ -static const struct gvt_mmio_block mmio_blocks[] = { - {D_SKL_PLUS ,_MMIO (DMC_MMIO_START_RANGE ),0x3000 ,NULL ,NULL }, - {D_ALL ,_MMIO (MCHBAR_MIRROR_BASE_SNB ),0x40000 ,NULL ,NULL }, - {D_ALL ,_MMIO (VGT_PVINFO_PAGE ),VGT_PVINFO_SIZE , - pvinfo_mmio_read, pvinfo_mmio_write}, - {D_ALL ,LGC_PALETTE (PIPE_A ,0 ),1024 ,NULL ,NULL }, - {D_ALL ,LGC_PALETTE (PIPE_B ,0 ),1024 ,NULL ,NULL }, - {D_ALL ,LGC_PALETTE (PIPE_C ,0 ),1024 ,NULL ,NULL }, -}; +static int do_mmio (u32 offset,u16 flags,u32 size,u32 addr_mask, +u32 ro_mask,u32 device, +struct intel_gvt_mmio_table_iter *iter) +{ +struct intel_gvt *gvt = iter->data; +struct intel_gvt_mmio_info *info, *p; +u32 start, end, i; + +if (!intel_gvt_match_device (gvt, device)) +return 0 ; + +if (WARN_ON (!IS_ALIGNED (offset,4 ))) +return -EINVAL ; + + start = offset; + end = offset + size; + +for (i = start; i < end; i +=4 ) { + info =kzalloc (sizeof (*info),GFP_KERNEL ); +if (!info) +return -ENOMEM ; + + info->offset = i; + p =intel_gvt_find_mmio_info (gvt, info->offset); +if (p) { +WARN (1 ,"dup mmio definition offset %x\n" , + info->offset); +kfree (info); + +/* We return -EEXIST here to make GVT-g load fail. +* So duplicated MMIO can be found as soon as +* possible. +*/ +return -EEXIST ; + } + + info->ro_mask = ro_mask; + info->device = device; + info->read = intel_vgpu_default_mmio_read; + info->write = intel_vgpu_default_mmio_write; + gvt->mmio.mmio_attribute[info->offset /4 ] = flags; +INIT_HLIST_NODE (&info->node); +hash_add (gvt->mmio.mmio_info_table, &info->node, info->offset); + gvt->mmio.num_tracked_mmio++; + } +return 0 ; +} + +static int do_mmio_block (u32 offset,u32 size,u32 device, +struct intel_gvt_mmio_table_iter *iter) +{ +struct intel_gvt *gvt = iter->data; +struct intel_gvt_mmio_block *block = gvt->mmio.mmio_block; +void *ret; + + ret =krealloc (block, + (gvt->mmio.num_mmio_block +1 ) *sizeof (*block), +GFP_KERNEL ); +if (!ret) +return -ENOMEM ; + + gvt->mmio.mmio_block = block = ret; + + block += gvt->mmio.num_mmio_block; + + block->offset = offset; + block->size = size; + block->device = device; + + gvt->mmio.num_mmio_block++; + +return 0 ; +} + +static int init_mmio_info (struct intel_gvt *gvt) +{ +struct intel_gvt_mmio_table_iter iter; + + iter.i915 = gvt->gt->i915; + iter.data = gvt; + iter.do_mmio = do_mmio; + iter.do_mmio_block = do_mmio_block; + +return intel_gvt_iterate_mmio_table (&iter); +} + +static int init_mmio_block_handlers (struct intel_gvt *gvt) +{ +struct intel_gvt_mmio_block *block; + + block =find_mmio_block (gvt,VGT_PVINFO_PAGE ); + block->read = pvinfo_mmio_read; + block->write = pvinfo_mmio_write; + +return 0 ; +}/** * intel_gvt_setup_mmio_info - setup MMIO information table for GVT device @@ -3703,39 +2496,44 @@ int intel_gvt_setup_mmio_info(struct intel_gvt *gvt)if (!gvt->mmio.mmio_attribute)return -ENOMEM ; - ret =init_generic_mmio_info (gvt); + ret =init_mmio_info (gvt); +if (ret) + goto err; + + ret =init_mmio_block_handlers (gvt); +if (ret) + goto err; + + ret =init_generic_mmio_handlers (gvt);if (ret) goto err;if (IS_BROADWELL (i915)) { - ret =init_bdw_mmio_info (gvt); + ret =init_bdw_mmio_handlers (gvt);if (ret) goto err; }else if (IS_SKYLAKE (i915) || -IS_KABYLAKE (i915) || -IS_COFFEELAKE (i915) || -IS_COMETLAKE (i915)) { - ret =init_bdw_mmio_info (gvt); +IS_KABYLAKE (i915) || +IS_COFFEELAKE (i915) || +IS_COMETLAKE (i915)) { + ret =init_bdw_mmio_handlers (gvt);if (ret) goto err; - ret =init_skl_mmio_info (gvt); + ret =init_skl_mmio_handlers (gvt);if (ret) goto err; }else if (IS_BROXTON (i915)) { - ret =init_bdw_mmio_info (gvt); + ret =init_bdw_mmio_handlers (gvt);if (ret) goto err; - ret =init_skl_mmio_info (gvt); + ret =init_skl_mmio_handlers (gvt);if (ret) goto err; - ret =init_bxt_mmio_info (gvt); + ret =init_bxt_mmio_handlers (gvt);if (ret) goto err; } - gvt->mmio.mmio_block = mmio_blocks; - gvt->mmio.num_mmio_block =ARRAY_SIZE (mmio_blocks); -return 0 ; err:intel_gvt_clean_mmio_info (gvt);@@ -3755,7 +2553,7 @@ int intel_gvt_for_each_tracked_mmio(struct intel_gvt *gvt,int (*handler)(struct intel_gvt *gvt,u32 offset,void *data), void *data) { - const struct gvt_mmio_block *block = gvt->mmio.mmio_block; + const struct intel_gvt_mmio_block *block = gvt->mmio.mmio_block;struct intel_gvt_mmio_info *e;int i, j, ret;@@ -3767,13 +2565,11 @@ int intel_gvt_for_each_tracked_mmio(struct intel_gvt *gvt,for (i =0 ; i < gvt->mmio.num_mmio_block; i++, block++) {/* pvinfo data doesn't come from hw mmio */ -if (i915_mmio_reg_offset (block->offset) ==VGT_PVINFO_PAGE ) +if (block->offset ==VGT_PVINFO_PAGE )continue ;for (j =0 ; j < block->size; j +=4 ) { - ret =handler (gvt, -i915_mmio_reg_offset (block->offset) + j, - data); + ret =handler (gvt, block->offset + j, data);if (ret)return ret; }@@ -3873,7 +2669,7 @@ int intel_vgpu_mmio_reg_rw(struct intel_vgpu *vgpu, unsigned int offset,struct drm_i915_private *i915 = vgpu->gvt->gt->i915;struct intel_gvt *gvt = vgpu->gvt;struct intel_gvt_mmio_info *mmio_info; -const struct gvt_mmio_block *mmio_block; +struct intel_gvt_mmio_block *mmio_block;gvt_mmio_func func;int ret;drivers/gpu/drm/i915/gvt/mmio.h +0
-2@@ -71,8 +71,6 @@ struct intel_gvt_mmio_info {const struct intel_engine_cs *intel_gvt_render_mmio_to_engine (struct intel_gvt *gvt,unsigned int reg); -unsigned long intel_gvt_get_device_type (struct intel_gvt *gvt); -bool intel_gvt_match_device (struct intel_gvt *gvt,unsigned long device);int intel_gvt_setup_mmio_info (struct intel_gvt *gvt);void intel_gvt_clean_mmio_info (struct intel_gvt *gvt);drivers/gpu/drm/i915/gvt/mmio_table.c new file +1386
-0@@ -0,0 +1,1386 @@ +/* +* Copyright(c) 2021 Intel Corporation. All rights reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +* SOFTWARE. +* +*/ + +#include "i915_drv.h" +#include "i915_pvinfo.h" +#include "gvt.h" + +/** +* intel_gvt_get_init_device_info - Fill a GVT device info +* @i915: drm i915 private data +* @info: GVT device info +* +* This function will be called during the initialization of a GVT device. +*/ +void intel_gvt_init_device_info (struct drm_i915_private *i915,struct intel_gvt_device_info *info) +{ +struct pci_dev *pdev =to_pci_dev (i915->drm.dev); + + info->max_support_vgpus =8 ; + info->cfg_space_size =PCI_CFG_SPACE_EXP_SIZE ; + info->mmio_size =2 *1024 *1024 ; + info->mmio_bar =0 ; + info->gtt_start_offset =8 *1024 *1024 ; + info->gtt_entry_size =8 ; + info->gtt_entry_size_shift =3 ; + info->gmadr_bytes_in_cmd =8 ; + info->max_surface_size =36 *1024 *1024 ; + info->msi_cap_offset = pdev->msi_cap; +} + +/** +* intel_gvt_get_device_type - return the device flag of a GVT device +* @i915: drm i915 private data +* +* This function will return the device flag of a GVT device. +*/ +unsigned long intel_gvt_get_device_type (struct drm_i915_private *i915) +{ +if (IS_BROADWELL (i915)) +return D_BDW ; +else if (IS_SKYLAKE (i915)) +return D_SKL ; +else if (IS_KABYLAKE (i915)) +return D_KBL ; +else if (IS_BROXTON (i915)) +return D_BXT ; +else if (IS_COFFEELAKE (i915) ||IS_COMETLAKE (i915)) +return D_CFL ; + +return 0 ; +} + +#define MMIO_F (reg, s, f, am, rm, d) do { \ + if (intel_gvt_get_device_type(iter->i915) & (d)) { \ + ret = iter->do_mmio(i915_mmio_reg_offset(reg), \ + f, s, am, rm, d, iter); \ + if (ret) \ + return ret; \ + } \ +} while (0) + +#define MMIO_D (reg, d) \ + MMIO_F(reg, 4, 0, 0, 0, d) + +#define MMIO_DF (reg, d, f) \ + MMIO_F(reg, 4, f, 0, 0, d) + +#define MMIO_GM_RDR (reg, d) \ + MMIO_F(reg, 4, F_GMADR | F_CMD_ACCESS, 0xFFFFF000, 0, d) + +#define MMIO_RO (reg, d, f, rm) \ + MMIO_F(reg, 4, F_RO | f, 0, rm, d) + +#define MMIO_RING_F (prefix, s, f, am, rm, d) do { \ + MMIO_F(prefix(RENDER_RING_BASE), s, f, am, rm, d); \ + MMIO_F(prefix(BLT_RING_BASE), s, f, am, rm, d); \ + MMIO_F(prefix(GEN6_BSD_RING_BASE), s, f, am, rm, d); \ + MMIO_F(prefix(VEBOX_RING_BASE), s, f, am, rm, d); \ + if (HAS_ENGINE(to_gt(iter->i915), VCS1)) \ + MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, f, am, rm, d); \ +} while (0) + +#define MMIO_RING_D (prefix, d) \ + MMIO_RING_F(prefix, 4, 0, 0, 0, d) + +#define MMIO_RING_DF (prefix, d, f) \ + MMIO_RING_F(prefix, 4, f, 0, 0, d) + +#define MMIO_RING_GM (prefix, d) \ + MMIO_RING_F(prefix, 4, F_GMADR, 0xFFFF0000, 0, d) + +#define MMIO_RING_GM_RDR (prefix, d) \ + MMIO_RING_F(prefix, 4, F_GMADR | F_CMD_ACCESS, 0xFFFF0000, 0, d) + +#define MMIO_RING_RO (prefix, d, f, rm) \ + MMIO_RING_F(prefix, 4, F_RO | f, 0, rm, d) + +static int iterate_generic_mmio (struct intel_gvt_mmio_table_iter *iter) +{ +struct drm_i915_private *dev_priv = iter->i915; +int ret; + +MMIO_RING_D (RING_IMR ,D_ALL ); +MMIO_D (SDEIMR ,D_ALL ); +MMIO_D (SDEIER ,D_ALL ); +MMIO_D (SDEIIR ,D_ALL ); +MMIO_D (SDEISR ,D_ALL ); +MMIO_RING_D (RING_HWSTAM ,D_ALL ); +MMIO_D (GEN8_GAMW_ECO_DEV_RW_IA ,D_BDW_PLUS ); +MMIO_GM_RDR (BSD_HWS_PGA_GEN7 ,D_ALL ); +MMIO_GM_RDR (BLT_HWS_PGA_GEN7 ,D_ALL ); +MMIO_GM_RDR (VEBOX_HWS_PGA_GEN7 ,D_ALL ); + +#define RING_REG (base) _MMIO((base) + 0x28) +MMIO_RING_DF (RING_REG ,D_ALL ,F_CMD_ACCESS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x134) +MMIO_RING_DF (RING_REG ,D_ALL ,F_CMD_ACCESS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x6c) +MMIO_RING_D (RING_REG ,D_ALL ); +#undef RING_REG +MMIO_D (GEN7_SC_INSTDONE ,D_BDW_PLUS ); +MMIO_GM_RDR (_MMIO (0x2148 ),D_ALL ); +MMIO_GM_RDR (CCID (RENDER_RING_BASE ),D_ALL ); +MMIO_GM_RDR (_MMIO (0x12198 ),D_ALL ); +MMIO_D (GEN7_CXT_SIZE ,D_ALL ); +MMIO_RING_D (RING_TAIL ,D_ALL ); +MMIO_RING_D (RING_HEAD ,D_ALL ); +MMIO_RING_D (RING_CTL ,D_ALL ); +MMIO_RING_D (RING_ACTHD ,D_ALL ); +MMIO_RING_GM (RING_START ,D_ALL ); + +/* RING MODE */ +#define RING_REG (base) _MMIO((base) + 0x29c) +MMIO_RING_DF (RING_REG ,D_ALL , +F_MODE_MASK |F_CMD_ACCESS |F_CMD_WRITE_PATCH ); +#undef RING_REG + +MMIO_RING_DF (RING_MI_MODE ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_RING_DF (RING_INSTPM ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_RING_DF (RING_TIMESTAMP ,D_ALL ,F_CMD_ACCESS ); +MMIO_RING_DF (RING_TIMESTAMP_UDW ,D_ALL ,F_CMD_ACCESS ); +MMIO_DF (GEN7_GT_MODE ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (CACHE_MODE_0_GEN7 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (CACHE_MODE_1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (CACHE_MODE_0 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2124 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x20dc ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (_3D_CHICKEN3,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2088 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (FF_SLICE_CS_CHICKEN2 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2470 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (GAM_ECOCHK ,D_ALL ,F_CMD_ACCESS ); +MMIO_DF (GEN7_COMMON_SLICE_CHICKEN1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (COMMON_SLICE_CHICKEN2 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x9030 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x20a0 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2420 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2430 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2434 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2438 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x243c ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x7018 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (HALF_SLICE_CHICKEN3 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (GEN7_HALF_SLICE_CHICKEN1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +/* display */ +MMIO_F (_MMIO (0x60220 ),0x20 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (_MMIO (0x602a0 ),D_ALL ); +MMIO_D (_MMIO (0x65050 ),D_ALL ); +MMIO_D (_MMIO (0x650b4 ),D_ALL ); +MMIO_D (_MMIO (0xc4040 ),D_ALL ); +MMIO_D (DERRMR ,D_ALL ); +MMIO_D (PIPEDSL (PIPE_A ),D_ALL ); +MMIO_D (PIPEDSL (PIPE_B ),D_ALL ); +MMIO_D (PIPEDSL (PIPE_C ),D_ALL ); +MMIO_D (PIPEDSL (_PIPE_EDP),D_ALL ); +MMIO_D (PIPECONF (PIPE_A ),D_ALL ); +MMIO_D (PIPECONF (PIPE_B ),D_ALL ); +MMIO_D (PIPECONF (PIPE_C ),D_ALL ); +MMIO_D (PIPECONF (_PIPE_EDP),D_ALL ); +MMIO_D (PIPESTAT (PIPE_A ),D_ALL ); +MMIO_D (PIPESTAT (PIPE_B ),D_ALL ); +MMIO_D (PIPESTAT (PIPE_C ),D_ALL ); +MMIO_D (PIPESTAT (_PIPE_EDP),D_ALL ); +MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_A ),D_ALL ); +MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_B ),D_ALL ); +MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_C ),D_ALL ); +MMIO_D (PIPE_FLIPCOUNT_G4X (_PIPE_EDP),D_ALL ); +MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_A ),D_ALL ); +MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_B ),D_ALL ); +MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_C ),D_ALL ); +MMIO_D (PIPE_FRMCOUNT_G4X (_PIPE_EDP),D_ALL ); +MMIO_D (CURCNTR (PIPE_A ),D_ALL ); +MMIO_D (CURCNTR (PIPE_B ),D_ALL ); +MMIO_D (CURCNTR (PIPE_C ),D_ALL ); +MMIO_D (CURPOS (PIPE_A ),D_ALL ); +MMIO_D (CURPOS (PIPE_B ),D_ALL ); +MMIO_D (CURPOS (PIPE_C ),D_ALL ); +MMIO_D (CURBASE (PIPE_A ),D_ALL ); +MMIO_D (CURBASE (PIPE_B ),D_ALL ); +MMIO_D (CURBASE (PIPE_C ),D_ALL ); +MMIO_D (CUR_FBC_CTL (PIPE_A ),D_ALL ); +MMIO_D (CUR_FBC_CTL (PIPE_B ),D_ALL ); +MMIO_D (CUR_FBC_CTL (PIPE_C ),D_ALL ); +MMIO_D (_MMIO (0x700ac ),D_ALL ); +MMIO_D (_MMIO (0x710ac ),D_ALL ); +MMIO_D (_MMIO (0x720ac ),D_ALL ); +MMIO_D (_MMIO (0x70090 ),D_ALL ); +MMIO_D (_MMIO (0x70094 ),D_ALL ); +MMIO_D (_MMIO (0x70098 ),D_ALL ); +MMIO_D (_MMIO (0x7009c ),D_ALL ); +MMIO_D (DSPCNTR (PIPE_A ),D_ALL ); +MMIO_D (DSPADDR (PIPE_A ),D_ALL ); +MMIO_D (DSPSTRIDE (PIPE_A ),D_ALL ); +MMIO_D (DSPPOS (PIPE_A ),D_ALL ); +MMIO_D (DSPSIZE (PIPE_A ),D_ALL ); +MMIO_D (DSPSURF (PIPE_A ),D_ALL ); +MMIO_D (DSPOFFSET (PIPE_A ),D_ALL ); +MMIO_D (DSPSURFLIVE (PIPE_A ),D_ALL ); +MMIO_D (REG_50080 (PIPE_A ,PLANE_PRIMARY ),D_ALL ); +MMIO_D (DSPCNTR (PIPE_B ),D_ALL ); +MMIO_D (DSPADDR (PIPE_B ),D_ALL ); +MMIO_D (DSPSTRIDE (PIPE_B ),D_ALL ); +MMIO_D (DSPPOS (PIPE_B ),D_ALL ); +MMIO_D (DSPSIZE (PIPE_B ),D_ALL ); +MMIO_D (DSPSURF (PIPE_B ),D_ALL ); +MMIO_D (DSPOFFSET (PIPE_B ),D_ALL ); +MMIO_D (DSPSURFLIVE (PIPE_B ),D_ALL ); +MMIO_D (REG_50080 (PIPE_B ,PLANE_PRIMARY ),D_ALL ); +MMIO_D (DSPCNTR (PIPE_C ),D_ALL ); +MMIO_D (DSPADDR (PIPE_C ),D_ALL ); +MMIO_D (DSPSTRIDE (PIPE_C ),D_ALL ); +MMIO_D (DSPPOS (PIPE_C ),D_ALL ); +MMIO_D (DSPSIZE (PIPE_C ),D_ALL ); +MMIO_D (DSPSURF (PIPE_C ),D_ALL ); +MMIO_D (DSPOFFSET (PIPE_C ),D_ALL ); +MMIO_D (DSPSURFLIVE (PIPE_C ),D_ALL ); +MMIO_D (REG_50080 (PIPE_C ,PLANE_PRIMARY ),D_ALL ); +MMIO_D (SPRCTL (PIPE_A ),D_ALL ); +MMIO_D (SPRLINOFF (PIPE_A ),D_ALL ); +MMIO_D (SPRSTRIDE (PIPE_A ),D_ALL ); +MMIO_D (SPRPOS (PIPE_A ),D_ALL ); +MMIO_D (SPRSIZE (PIPE_A ),D_ALL ); +MMIO_D (SPRKEYVAL (PIPE_A ),D_ALL ); +MMIO_D (SPRKEYMSK (PIPE_A ),D_ALL ); +MMIO_D (SPRSURF (PIPE_A ),D_ALL ); +MMIO_D (SPRKEYMAX (PIPE_A ),D_ALL ); +MMIO_D (SPROFFSET (PIPE_A ),D_ALL ); +MMIO_D (SPRSCALE (PIPE_A ),D_ALL ); +MMIO_D (SPRSURFLIVE (PIPE_A ),D_ALL ); +MMIO_D (REG_50080 (PIPE_A ,PLANE_SPRITE0 ),D_ALL ); +MMIO_D (SPRCTL (PIPE_B ),D_ALL ); +MMIO_D (SPRLINOFF (PIPE_B ),D_ALL ); +MMIO_D (SPRSTRIDE (PIPE_B ),D_ALL ); +MMIO_D (SPRPOS (PIPE_B ),D_ALL ); +MMIO_D (SPRSIZE (PIPE_B ),D_ALL ); +MMIO_D (SPRKEYVAL (PIPE_B ),D_ALL ); +MMIO_D (SPRKEYMSK (PIPE_B ),D_ALL ); +MMIO_D (SPRSURF (PIPE_B ),D_ALL ); +MMIO_D (SPRKEYMAX (PIPE_B ),D_ALL ); +MMIO_D (SPROFFSET (PIPE_B ),D_ALL ); +MMIO_D (SPRSCALE (PIPE_B ),D_ALL ); +MMIO_D (SPRSURFLIVE (PIPE_B ),D_ALL ); +MMIO_D (REG_50080 (PIPE_B ,PLANE_SPRITE0 ),D_ALL ); +MMIO_D (SPRCTL (PIPE_C ),D_ALL ); +MMIO_D (SPRLINOFF (PIPE_C ),D_ALL ); +MMIO_D (SPRSTRIDE (PIPE_C ),D_ALL ); +MMIO_D (SPRPOS (PIPE_C ),D_ALL ); +MMIO_D (SPRSIZE (PIPE_C ),D_ALL ); +MMIO_D (SPRKEYVAL (PIPE_C ),D_ALL ); +MMIO_D (SPRKEYMSK (PIPE_C ),D_ALL ); +MMIO_D (SPRSURF (PIPE_C ),D_ALL ); +MMIO_D (SPRKEYMAX (PIPE_C ),D_ALL ); +MMIO_D (SPROFFSET (PIPE_C ),D_ALL ); +MMIO_D (SPRSCALE (PIPE_C ),D_ALL ); +MMIO_D (SPRSURFLIVE (PIPE_C ),D_ALL ); +MMIO_D (REG_50080 (PIPE_C ,PLANE_SPRITE0 ),D_ALL ); +MMIO_D (HTOTAL (TRANSCODER_A ),D_ALL ); +MMIO_D (HBLANK (TRANSCODER_A ),D_ALL ); +MMIO_D (HSYNC (TRANSCODER_A ),D_ALL ); +MMIO_D (VTOTAL (TRANSCODER_A ),D_ALL ); +MMIO_D (VBLANK (TRANSCODER_A ),D_ALL ); +MMIO_D (VSYNC (TRANSCODER_A ),D_ALL ); +MMIO_D (BCLRPAT (TRANSCODER_A ),D_ALL ); +MMIO_D (VSYNCSHIFT (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPESRC (TRANSCODER_A ),D_ALL ); +MMIO_D (HTOTAL (TRANSCODER_B ),D_ALL ); +MMIO_D (HBLANK (TRANSCODER_B ),D_ALL ); +MMIO_D (HSYNC (TRANSCODER_B ),D_ALL ); +MMIO_D (VTOTAL (TRANSCODER_B ),D_ALL ); +MMIO_D (VBLANK (TRANSCODER_B ),D_ALL ); +MMIO_D (VSYNC (TRANSCODER_B ),D_ALL ); +MMIO_D (BCLRPAT (TRANSCODER_B ),D_ALL ); +MMIO_D (VSYNCSHIFT (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPESRC (TRANSCODER_B ),D_ALL ); +MMIO_D (HTOTAL (TRANSCODER_C ),D_ALL ); +MMIO_D (HBLANK (TRANSCODER_C ),D_ALL ); +MMIO_D (HSYNC (TRANSCODER_C ),D_ALL ); +MMIO_D (VTOTAL (TRANSCODER_C ),D_ALL ); +MMIO_D (VBLANK (TRANSCODER_C ),D_ALL ); +MMIO_D (VSYNC (TRANSCODER_C ),D_ALL ); +MMIO_D (BCLRPAT (TRANSCODER_C ),D_ALL ); +MMIO_D (VSYNCSHIFT (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPESRC (TRANSCODER_C ),D_ALL ); +MMIO_D (HTOTAL (TRANSCODER_EDP ),D_ALL ); +MMIO_D (HBLANK (TRANSCODER_EDP ),D_ALL ); +MMIO_D (HSYNC (TRANSCODER_EDP ),D_ALL ); +MMIO_D (VTOTAL (TRANSCODER_EDP ),D_ALL ); +MMIO_D (VBLANK (TRANSCODER_EDP ),D_ALL ); +MMIO_D (VSYNC (TRANSCODER_EDP ),D_ALL ); +MMIO_D (BCLRPAT (TRANSCODER_EDP ),D_ALL ); +MMIO_D (VSYNCSHIFT (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_DATA_M1 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_DATA_N1 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_DATA_M2 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_DATA_N2 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_LINK_M1 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_LINK_N1 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_LINK_M2 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_LINK_N2 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_DATA_M1 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_DATA_N1 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_DATA_M2 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_DATA_N2 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_LINK_M1 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_LINK_N1 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_LINK_M2 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_LINK_N2 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_DATA_M1 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_DATA_N1 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_DATA_M2 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_DATA_N2 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_LINK_M1 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_LINK_N1 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_LINK_M2 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_LINK_N2 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_DATA_M1 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_DATA_N1 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_DATA_M2 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_DATA_N2 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_LINK_M1 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_LINK_N1 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_LINK_M2 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_LINK_N2 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PF_CTL (PIPE_A ),D_ALL ); +MMIO_D (PF_WIN_SZ (PIPE_A ),D_ALL ); +MMIO_D (PF_WIN_POS (PIPE_A ),D_ALL ); +MMIO_D (PF_VSCALE (PIPE_A ),D_ALL ); +MMIO_D (PF_HSCALE (PIPE_A ),D_ALL ); +MMIO_D (PF_CTL (PIPE_B ),D_ALL ); +MMIO_D (PF_WIN_SZ (PIPE_B ),D_ALL ); +MMIO_D (PF_WIN_POS (PIPE_B ),D_ALL ); +MMIO_D (PF_VSCALE (PIPE_B ),D_ALL ); +MMIO_D (PF_HSCALE (PIPE_B ),D_ALL ); +MMIO_D (PF_CTL (PIPE_C ),D_ALL ); +MMIO_D (PF_WIN_SZ (PIPE_C ),D_ALL ); +MMIO_D (PF_WIN_POS (PIPE_C ),D_ALL ); +MMIO_D (PF_VSCALE (PIPE_C ),D_ALL ); +MMIO_D (PF_HSCALE (PIPE_C ),D_ALL ); +MMIO_D (WM0_PIPE_ILK (PIPE_A ),D_ALL ); +MMIO_D (WM0_PIPE_ILK (PIPE_B ),D_ALL ); +MMIO_D (WM0_PIPE_ILK (PIPE_C ),D_ALL ); +MMIO_D (WM1_LP_ILK ,D_ALL ); +MMIO_D (WM2_LP_ILK ,D_ALL ); +MMIO_D (WM3_LP_ILK ,D_ALL ); +MMIO_D (WM1S_LP_ILK ,D_ALL ); +MMIO_D (WM2S_LP_IVB ,D_ALL ); +MMIO_D (WM3S_LP_IVB ,D_ALL ); +MMIO_D (BLC_PWM_CPU_CTL2 ,D_ALL ); +MMIO_D (BLC_PWM_CPU_CTL ,D_ALL ); +MMIO_D (BLC_PWM_PCH_CTL1 ,D_ALL ); +MMIO_D (BLC_PWM_PCH_CTL2 ,D_ALL ); +MMIO_D (_MMIO (0x48268 ),D_ALL ); +MMIO_F (PCH_GMBUS0 ,4 *4 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (PCH_GPIO_BASE ,6 *4 ,F_UNALIGN ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0xe4f00 ),0x28 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (_PCH_DPB_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (_PCH_DPC_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (_PCH_DPD_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_D (PCH_ADPA ,D_PRE_SKL ); +MMIO_D (_MMIO (_PCH_TRANSACONF),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSBCONF),D_ALL ); +MMIO_D (FDI_RX_IIR (PIPE_A ),D_ALL ); +MMIO_D (FDI_RX_IIR (PIPE_B ),D_ALL ); +MMIO_D (FDI_RX_IIR (PIPE_C ),D_ALL ); +MMIO_D (FDI_RX_IMR (PIPE_A ),D_ALL ); +MMIO_D (FDI_RX_IMR (PIPE_B ),D_ALL ); +MMIO_D (FDI_RX_IMR (PIPE_C ),D_ALL ); +MMIO_D (FDI_RX_CTL (PIPE_A ),D_ALL ); +MMIO_D (FDI_RX_CTL (PIPE_B ),D_ALL ); +MMIO_D (FDI_RX_CTL (PIPE_C ),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_HTOTAL_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_HBLANK_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_HSYNC_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VTOTAL_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VBLANK_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VSYNC_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VSYNCSHIFT_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_HTOTAL_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_HBLANK_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_HSYNC_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VTOTAL_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VBLANK_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VSYNC_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VSYNCSHIFT_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_DATA_M1),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_DATA_N1),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_DATA_M2),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_DATA_N2),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_LINK_M1),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_LINK_N1),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_LINK_M2),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_LINK_N2),D_ALL ); +MMIO_D (TRANS_DP_CTL (PIPE_A ),D_ALL ); +MMIO_D (TRANS_DP_CTL (PIPE_B ),D_ALL ); +MMIO_D (TRANS_DP_CTL (PIPE_C ),D_ALL ); +MMIO_D (TVIDEO_DIP_CTL (PIPE_A ),D_ALL ); +MMIO_D (TVIDEO_DIP_DATA (PIPE_A ),D_ALL ); +MMIO_D (TVIDEO_DIP_GCP (PIPE_A ),D_ALL ); +MMIO_D (TVIDEO_DIP_CTL (PIPE_B ),D_ALL ); +MMIO_D (TVIDEO_DIP_DATA (PIPE_B ),D_ALL ); +MMIO_D (TVIDEO_DIP_GCP (PIPE_B ),D_ALL ); +MMIO_D (TVIDEO_DIP_CTL (PIPE_C ),D_ALL ); +MMIO_D (TVIDEO_DIP_DATA (PIPE_C ),D_ALL ); +MMIO_D (TVIDEO_DIP_GCP (PIPE_C ),D_ALL ); +MMIO_D (_MMIO (_FDI_RXA_MISC),D_ALL ); +MMIO_D (_MMIO (_FDI_RXB_MISC),D_ALL ); +MMIO_D (_MMIO (_FDI_RXA_TUSIZE1),D_ALL ); +MMIO_D (_MMIO (_FDI_RXA_TUSIZE2),D_ALL ); +MMIO_D (_MMIO (_FDI_RXB_TUSIZE1),D_ALL ); +MMIO_D (_MMIO (_FDI_RXB_TUSIZE2),D_ALL ); +MMIO_D (PCH_PP_CONTROL ,D_ALL ); +MMIO_D (PCH_PP_DIVISOR ,D_ALL ); +MMIO_D (PCH_PP_STATUS ,D_ALL ); +MMIO_D (PCH_LVDS ,D_ALL ); +MMIO_D (_MMIO (_PCH_DPLL_A),D_ALL ); +MMIO_D (_MMIO (_PCH_DPLL_B),D_ALL ); +MMIO_D (_MMIO (_PCH_FPA0),D_ALL ); +MMIO_D (_MMIO (_PCH_FPA1),D_ALL ); +MMIO_D (_MMIO (_PCH_FPB0),D_ALL ); +MMIO_D (_MMIO (_PCH_FPB1),D_ALL ); +MMIO_D (PCH_DREF_CONTROL ,D_ALL ); +MMIO_D (PCH_RAWCLK_FREQ ,D_ALL ); +MMIO_D (PCH_DPLL_SEL ,D_ALL ); +MMIO_D (_MMIO (0x61208 ),D_ALL ); +MMIO_D (_MMIO (0x6120c ),D_ALL ); +MMIO_D (PCH_PP_ON_DELAYS ,D_ALL ); +MMIO_D (PCH_PP_OFF_DELAYS ,D_ALL ); +MMIO_D (_MMIO (0xe651c ),D_ALL ); +MMIO_D (_MMIO (0xe661c ),D_ALL ); +MMIO_D (_MMIO (0xe671c ),D_ALL ); +MMIO_D (_MMIO (0xe681c ),D_ALL ); +MMIO_D (_MMIO (0xe6c04 ),D_ALL ); +MMIO_D (_MMIO (0xe6e1c ),D_ALL ); +MMIO_RO (PCH_PORT_HOTPLUG ,D_ALL ,0 , +PORTA_HOTPLUG_STATUS_MASK + |PORTB_HOTPLUG_STATUS_MASK + |PORTC_HOTPLUG_STATUS_MASK + |PORTD_HOTPLUG_STATUS_MASK ); +MMIO_D (LCPLL_CTL ,D_ALL ); +MMIO_D (FUSE_STRAP ,D_ALL ); +MMIO_D (DIGITAL_PORT_HOTPLUG_CNTRL ,D_ALL ); +MMIO_D (DISP_ARB_CTL ,D_ALL ); +MMIO_D (DISP_ARB_CTL2 ,D_ALL ); +MMIO_D (ILK_DISPLAY_CHICKEN1 ,D_ALL ); +MMIO_D (ILK_DISPLAY_CHICKEN2 ,D_ALL ); +MMIO_D (ILK_DSPCLK_GATE_D ,D_ALL ); +MMIO_D (SOUTH_CHICKEN1 ,D_ALL ); +MMIO_D (SOUTH_CHICKEN2 ,D_ALL ); +MMIO_D (_MMIO (_TRANSA_CHICKEN1),D_ALL ); +MMIO_D (_MMIO (_TRANSB_CHICKEN1),D_ALL ); +MMIO_D (SOUTH_DSPCLK_GATE_D ,D_ALL ); +MMIO_D (_MMIO (_TRANSA_CHICKEN2),D_ALL ); +MMIO_D (_MMIO (_TRANSB_CHICKEN2),D_ALL ); +MMIO_D (ILK_DPFC_CB_BASE (INTEL_FBC_A ),D_ALL ); +MMIO_D (ILK_DPFC_CONTROL (INTEL_FBC_A ),D_ALL ); +MMIO_D (ILK_DPFC_RECOMP_CTL (INTEL_FBC_A ),D_ALL ); +MMIO_D (ILK_DPFC_STATUS (INTEL_FBC_A ),D_ALL ); +MMIO_D (ILK_DPFC_FENCE_YOFF (INTEL_FBC_A ),D_ALL ); +MMIO_D (ILK_DPFC_CHICKEN (INTEL_FBC_A ),D_ALL ); +MMIO_D (ILK_FBC_RT_BASE ,D_ALL ); +MMIO_D (IPS_CTL ,D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RY_GY (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BY (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RU_GU (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BU (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RV_GV (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BV (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_MODE (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_HI (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_ME (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_LO (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_HI (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_ME (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_LO (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RY_GY (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BY (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RU_GU (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BU (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RV_GV (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BV (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_MODE (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_HI (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_ME (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_LO (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_HI (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_ME (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_LO (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RY_GY (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BY (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RU_GU (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BU (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RV_GV (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BV (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_MODE (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_HI (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_ME (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_LO (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_HI (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_ME (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_LO (PIPE_C ),D_ALL ); +MMIO_D (PREC_PAL_INDEX (PIPE_A ),D_ALL ); +MMIO_D (PREC_PAL_DATA (PIPE_A ),D_ALL ); +MMIO_F (PREC_PAL_GC_MAX (PIPE_A ,0 ),4 *3 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (PREC_PAL_INDEX (PIPE_B ),D_ALL ); +MMIO_D (PREC_PAL_DATA (PIPE_B ),D_ALL ); +MMIO_F (PREC_PAL_GC_MAX (PIPE_B ,0 ),4 *3 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (PREC_PAL_INDEX (PIPE_C ),D_ALL ); +MMIO_D (PREC_PAL_DATA (PIPE_C ),D_ALL ); +MMIO_F (PREC_PAL_GC_MAX (PIPE_C ,0 ),4 *3 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (_MMIO (0x60110 ),D_ALL ); +MMIO_D (_MMIO (0x61110 ),D_ALL ); +MMIO_F (_MMIO (0x70400 ),0x40 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x71400 ),0x40 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x72400 ),0x40 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x70440 ),0xc ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (0x71440 ),0xc ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (0x72440 ),0xc ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (0x7044c ),0xc ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (0x7144c ),0xc ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (0x7244c ),0xc ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_D (WM_LINETIME (PIPE_A ),D_ALL ); +MMIO_D (WM_LINETIME (PIPE_B ),D_ALL ); +MMIO_D (WM_LINETIME (PIPE_C ),D_ALL ); +MMIO_D (SPLL_CTL ,D_ALL ); +MMIO_D (_MMIO (_WRPLL_CTL1),D_ALL ); +MMIO_D (_MMIO (_WRPLL_CTL2),D_ALL ); +MMIO_D (PORT_CLK_SEL (PORT_A ),D_ALL ); +MMIO_D (PORT_CLK_SEL (PORT_B ),D_ALL ); +MMIO_D (PORT_CLK_SEL (PORT_C ),D_ALL ); +MMIO_D (PORT_CLK_SEL (PORT_D ),D_ALL ); +MMIO_D (PORT_CLK_SEL (PORT_E ),D_ALL ); +MMIO_D (TRANS_CLK_SEL (TRANSCODER_A ),D_ALL ); +MMIO_D (TRANS_CLK_SEL (TRANSCODER_B ),D_ALL ); +MMIO_D (TRANS_CLK_SEL (TRANSCODER_C ),D_ALL ); +MMIO_D (HSW_NDE_RSTWRN_OPT ,D_ALL ); +MMIO_D (_MMIO (0x46508 ),D_ALL ); +MMIO_D (_MMIO (0x49080 ),D_ALL ); +MMIO_D (_MMIO (0x49180 ),D_ALL ); +MMIO_D (_MMIO (0x49280 ),D_ALL ); +MMIO_F (_MMIO (0x49090 ),0x14 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x49190 ),0x14 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x49290 ),0x14 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (GAMMA_MODE (PIPE_A ),D_ALL ); +MMIO_D (GAMMA_MODE (PIPE_B ),D_ALL ); +MMIO_D (GAMMA_MODE (PIPE_C ),D_ALL ); +MMIO_D (PIPE_MULT (PIPE_A ),D_ALL ); +MMIO_D (PIPE_MULT (PIPE_B ),D_ALL ); +MMIO_D (PIPE_MULT (PIPE_C ),D_ALL ); +MMIO_D (HSW_TVIDEO_DIP_CTL (TRANSCODER_A ),D_ALL ); +MMIO_D (HSW_TVIDEO_DIP_CTL (TRANSCODER_B ),D_ALL ); +MMIO_D (HSW_TVIDEO_DIP_CTL (TRANSCODER_C ),D_ALL ); +MMIO_D (SFUSE_STRAP ,D_ALL ); +MMIO_D (SBI_ADDR ,D_ALL ); +MMIO_D (SBI_DATA ,D_ALL ); +MMIO_D (SBI_CTL_STAT ,D_ALL ); +MMIO_D (PIXCLK_GATE ,D_ALL ); +MMIO_F (_MMIO (_DPA_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (DDI_BUF_CTL (PORT_A ),D_ALL ); +MMIO_D (DDI_BUF_CTL (PORT_B ),D_ALL ); +MMIO_D (DDI_BUF_CTL (PORT_C ),D_ALL ); +MMIO_D (DDI_BUF_CTL (PORT_D ),D_ALL ); +MMIO_D (DDI_BUF_CTL (PORT_E ),D_ALL ); +MMIO_D (DP_TP_CTL (PORT_A ),D_ALL ); +MMIO_D (DP_TP_CTL (PORT_B ),D_ALL ); +MMIO_D (DP_TP_CTL (PORT_C ),D_ALL ); +MMIO_D (DP_TP_CTL (PORT_D ),D_ALL ); +MMIO_D (DP_TP_CTL (PORT_E ),D_ALL ); +MMIO_D (DP_TP_STATUS (PORT_A ),D_ALL ); +MMIO_D (DP_TP_STATUS (PORT_B ),D_ALL ); +MMIO_D (DP_TP_STATUS (PORT_C ),D_ALL ); +MMIO_D (DP_TP_STATUS (PORT_D ),D_ALL ); +MMIO_D (DP_TP_STATUS (PORT_E ),D_ALL ); +MMIO_F (_MMIO (_DDI_BUF_TRANS_A),0x50 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x64e60 ),0x50 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x64eC0 ),0x50 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x64f20 ),0x50 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x64f80 ),0x50 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (HSW_AUD_CFG (PIPE_A ),D_ALL ); +MMIO_D (HSW_AUD_PIN_ELD_CP_VLD ,D_ALL ); +MMIO_D (HSW_AUD_MISC_CTRL (PIPE_A ),D_ALL ); +MMIO_D (_MMIO (_TRANS_DDI_FUNC_CTL_A),D_ALL ); +MMIO_D (_MMIO (_TRANS_DDI_FUNC_CTL_B),D_ALL ); +MMIO_D (_MMIO (_TRANS_DDI_FUNC_CTL_C),D_ALL ); +MMIO_D (_MMIO (_TRANS_DDI_FUNC_CTL_EDP),D_ALL ); +MMIO_D (_MMIO (_TRANSA_MSA_MISC),D_ALL ); +MMIO_D (_MMIO (_TRANSB_MSA_MISC),D_ALL ); +MMIO_D (_MMIO (_TRANSC_MSA_MISC),D_ALL ); +MMIO_D (_MMIO (_TRANS_EDP_MSA_MISC),D_ALL ); +MMIO_D (FORCEWAKE ,D_ALL ); +MMIO_D (FORCEWAKE_ACK ,D_ALL ); +MMIO_D (GEN6_GT_CORE_STATUS ,D_ALL ); +MMIO_D (GEN6_GT_THREAD_STATUS_REG ,D_ALL ); +MMIO_DF (GTFIFODBG ,D_ALL ,F_CMD_ACCESS ); +MMIO_DF (GTFIFOCTL ,D_ALL ,F_CMD_ACCESS ); +MMIO_D (FORCEWAKE_MT ,D_PRE_SKL ); +MMIO_D (FORCEWAKE_ACK_HSW ,D_BDW ); +MMIO_D (ECOBUS ,D_ALL ); +MMIO_D (GEN6_RC_CONTROL ,D_ALL ); +MMIO_D (GEN6_RC_STATE ,D_ALL ); +MMIO_D (GEN6_RPNSWREQ ,D_ALL ); +MMIO_D (GEN6_RC_VIDEO_FREQ ,D_ALL ); +MMIO_D (GEN6_RP_DOWN_TIMEOUT ,D_ALL ); +MMIO_D (GEN6_RP_INTERRUPT_LIMITS ,D_ALL ); +MMIO_D (GEN6_RPSTAT1 ,D_ALL ); +MMIO_D (GEN6_RP_CONTROL ,D_ALL ); +MMIO_D (GEN6_RP_UP_THRESHOLD ,D_ALL ); +MMIO_D (GEN6_RP_DOWN_THRESHOLD ,D_ALL ); +MMIO_D (GEN6_RP_CUR_UP_EI ,D_ALL ); +MMIO_D (GEN6_RP_CUR_UP ,D_ALL ); +MMIO_D (GEN6_RP_PREV_UP ,D_ALL ); +MMIO_D (GEN6_RP_CUR_DOWN_EI ,D_ALL ); +MMIO_D (GEN6_RP_CUR_DOWN ,D_ALL ); +MMIO_D (GEN6_RP_PREV_DOWN ,D_ALL ); +MMIO_D (GEN6_RP_UP_EI ,D_ALL ); +MMIO_D (GEN6_RP_DOWN_EI ,D_ALL ); +MMIO_D (GEN6_RP_IDLE_HYSTERSIS ,D_ALL ); +MMIO_D (GEN6_RC1_WAKE_RATE_LIMIT ,D_ALL ); +MMIO_D (GEN6_RC6_WAKE_RATE_LIMIT ,D_ALL ); +MMIO_D (GEN6_RC6pp_WAKE_RATE_LIMIT,D_ALL ); +MMIO_D (GEN6_RC_EVALUATION_INTERVAL ,D_ALL ); +MMIO_D (GEN6_RC_IDLE_HYSTERSIS ,D_ALL ); +MMIO_D (GEN6_RC_SLEEP ,D_ALL ); +MMIO_D (GEN6_RC1e_THRESHOLD,D_ALL ); +MMIO_D (GEN6_RC6_THRESHOLD ,D_ALL ); +MMIO_D (GEN6_RC6p_THRESHOLD,D_ALL ); +MMIO_D (GEN6_RC6pp_THRESHOLD,D_ALL ); +MMIO_D (GEN6_PMINTRMSK ,D_ALL ); +MMIO_D (HSW_PWR_WELL_CTL1 ,D_BDW ); +MMIO_D (HSW_PWR_WELL_CTL2 ,D_BDW ); +MMIO_D (HSW_PWR_WELL_CTL3 ,D_BDW ); +MMIO_D (HSW_PWR_WELL_CTL4 ,D_BDW ); +MMIO_D (HSW_PWR_WELL_CTL5 ,D_BDW ); +MMIO_D (HSW_PWR_WELL_CTL6 ,D_BDW ); +MMIO_D (RSTDBYCTL ,D_ALL ); +MMIO_D (GEN6_GDRST ,D_ALL ); +MMIO_F (FENCE_REG_GEN6_LO (0 ),0x80 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (CPU_VGACNTRL ,D_ALL ); +MMIO_D (TILECTL ,D_ALL ); +MMIO_D (GEN6_UCGCTL1 ,D_ALL ); +MMIO_D (GEN6_UCGCTL2 ,D_ALL ); +MMIO_F (_MMIO (0x4f000 ),0x90 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (GEN6_PCODE_DATA ,D_ALL ); +MMIO_D (_MMIO (0x13812c ),D_ALL ); +MMIO_D (GEN7_ERR_INT ,D_ALL ); +MMIO_D (HSW_EDRAM_CAP ,D_ALL ); +MMIO_D (HSW_IDICR ,D_ALL ); +MMIO_D (GFX_FLSH_CNTL_GEN6 ,D_ALL ); +MMIO_D (_MMIO (0x3c ),D_ALL ); +MMIO_D (_MMIO (0x860 ),D_ALL ); +MMIO_D (ECOSKPD (RENDER_RING_BASE ),D_ALL ); +MMIO_D (_MMIO (0x121d0 ),D_ALL ); +MMIO_D (ECOSKPD (BLT_RING_BASE ),D_ALL ); +MMIO_D (_MMIO (0x41d0 ),D_ALL ); +MMIO_D (GAC_ECO_BITS ,D_ALL ); +MMIO_D (_MMIO (0x6200 ),D_ALL ); +MMIO_D (_MMIO (0x6204 ),D_ALL ); +MMIO_D (_MMIO (0x6208 ),D_ALL ); +MMIO_D (_MMIO (0x7118 ),D_ALL ); +MMIO_D (_MMIO (0x7180 ),D_ALL ); +MMIO_D (_MMIO (0x7408 ),D_ALL ); +MMIO_D (_MMIO (0x7c00 ),D_ALL ); +MMIO_D (GEN6_MBCTL ,D_ALL ); +MMIO_D (_MMIO (0x911c ),D_ALL ); +MMIO_D (_MMIO (0x9120 ),D_ALL ); +MMIO_DF (GEN7_UCGCTL4 ,D_ALL ,F_CMD_ACCESS ); +MMIO_D (GAB_CTL ,D_ALL ); +MMIO_D (_MMIO (0x48800 ),D_ALL ); +MMIO_D (_MMIO (0xce044 ),D_ALL ); +MMIO_D (_MMIO (0xe6500 ),D_ALL ); +MMIO_D (_MMIO (0xe6504 ),D_ALL ); +MMIO_D (_MMIO (0xe6600 ),D_ALL ); +MMIO_D (_MMIO (0xe6604 ),D_ALL ); +MMIO_D (_MMIO (0xe6700 ),D_ALL ); +MMIO_D (_MMIO (0xe6704 ),D_ALL ); +MMIO_D (_MMIO (0xe6800 ),D_ALL ); +MMIO_D (_MMIO (0xe6804 ),D_ALL ); +MMIO_D (PCH_GMBUS4 ,D_ALL ); +MMIO_D (PCH_GMBUS5 ,D_ALL ); +MMIO_D (_MMIO (0x902c ),D_ALL ); +MMIO_D (_MMIO (0xec008 ),D_ALL ); +MMIO_D (_MMIO (0xec00c ),D_ALL ); +MMIO_D (_MMIO (0xec008 +0x18 ),D_ALL ); +MMIO_D (_MMIO (0xec00c +0x18 ),D_ALL ); +MMIO_D (_MMIO (0xec008 +0x18 *2 ),D_ALL ); +MMIO_D (_MMIO (0xec00c +0x18 *2 ),D_ALL ); +MMIO_D (_MMIO (0xec008 +0x18 *3 ),D_ALL ); +MMIO_D (_MMIO (0xec00c +0x18 *3 ),D_ALL ); +MMIO_D (_MMIO (0xec408 ),D_ALL ); +MMIO_D (_MMIO (0xec40c ),D_ALL ); +MMIO_D (_MMIO (0xec408 +0x18 ),D_ALL ); +MMIO_D (_MMIO (0xec40c +0x18 ),D_ALL ); +MMIO_D (_MMIO (0xec408 +0x18 *2 ),D_ALL ); +MMIO_D (_MMIO (0xec40c +0x18 *2 ),D_ALL ); +MMIO_D (_MMIO (0xec408 +0x18 *3 ),D_ALL ); +MMIO_D (_MMIO (0xec40c +0x18 *3 ),D_ALL ); +MMIO_D (_MMIO (0xfc810 ),D_ALL ); +MMIO_D (_MMIO (0xfc81c ),D_ALL ); +MMIO_D (_MMIO (0xfc828 ),D_ALL ); +MMIO_D (_MMIO (0xfc834 ),D_ALL ); +MMIO_D (_MMIO (0xfcc00 ),D_ALL ); +MMIO_D (_MMIO (0xfcc0c ),D_ALL ); +MMIO_D (_MMIO (0xfcc18 ),D_ALL ); +MMIO_D (_MMIO (0xfcc24 ),D_ALL ); +MMIO_D (_MMIO (0xfd000 ),D_ALL ); +MMIO_D (_MMIO (0xfd00c ),D_ALL ); +MMIO_D (_MMIO (0xfd018 ),D_ALL ); +MMIO_D (_MMIO (0xfd024 ),D_ALL ); +MMIO_D (_MMIO (0xfd034 ),D_ALL ); +MMIO_D (FPGA_DBG ,D_ALL ); +MMIO_D (_MMIO (0x2054 ),D_ALL ); +MMIO_D (_MMIO (0x12054 ),D_ALL ); +MMIO_D (_MMIO (0x22054 ),D_ALL ); +MMIO_D (_MMIO (0x1a054 ),D_ALL ); +MMIO_D (_MMIO (0x44070 ),D_ALL ); +MMIO_DF (_MMIO (0x215c ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2178 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x217c ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x12178 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x1217c ),D_ALL ,F_CMD_ACCESS ); +MMIO_F (_MMIO (0x2290 ),8 ,F_CMD_ACCESS ,0 ,0 ,D_BDW_PLUS ); +MMIO_D (_MMIO (0x2b00 ),D_BDW_PLUS ); +MMIO_D (_MMIO (0x2360 ),D_BDW_PLUS ); +MMIO_F (_MMIO (0x5200 ),32 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x5240 ),32 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x5280 ),16 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_DF (_MMIO (0x1c17c ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x1c178 ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (BCS_SWCTRL ,D_ALL ,F_CMD_ACCESS ); +MMIO_F (HS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (DS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (IA_VERTICES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (IA_PRIMITIVES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (VS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (GS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (GS_PRIMITIVES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (CL_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (CL_PRIMITIVES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (PS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (PS_DEPTH_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_D (_MMIO (0x4260 ),D_BDW_PLUS ); +MMIO_D (_MMIO (0x4264 ),D_BDW_PLUS ); +MMIO_D (_MMIO (0x4268 ),D_BDW_PLUS ); +MMIO_D (_MMIO (0x426c ),D_BDW_PLUS ); +MMIO_D (_MMIO (0x4270 ),D_BDW_PLUS ); +MMIO_DF (_MMIO (0x4094 ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (ARB_MODE ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_RING_GM (RING_BBADDR ,D_ALL ); +MMIO_DF (_MMIO (0x2220 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x12220 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x22220 ),D_ALL ,F_CMD_ACCESS ); +MMIO_RING_DF (RING_SYNC_1 ,D_ALL ,F_CMD_ACCESS ); +MMIO_RING_DF (RING_SYNC_0 ,D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x22178 ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x1a178 ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x1a17c ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2217c ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_D (EDP_PSR_IMR ,D_BDW_PLUS ); +MMIO_D (EDP_PSR_IIR ,D_BDW_PLUS ); +MMIO_D (GUC_STATUS ,D_ALL ); + +return 0 ; +} + +static int iterate_bdw_mmio (struct intel_gvt_mmio_table_iter *iter) +{ +struct drm_i915_private *dev_priv = iter->i915; +int ret; + +MMIO_D (GEN8_GT_IMR (0 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IER (0 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IIR (0 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_ISR (0 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IMR (1 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IER (1 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IIR (1 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_ISR (1 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IMR (2 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IER (2 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IIR (2 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_ISR (2 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IMR (3 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IER (3 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IIR (3 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_ISR (3 ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IMR (PIPE_A ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IER (PIPE_A ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IIR (PIPE_A ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_ISR (PIPE_A ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IMR (PIPE_B ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IER (PIPE_B ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IIR (PIPE_B ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_ISR (PIPE_B ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IMR (PIPE_C ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IER (PIPE_C ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IIR (PIPE_C ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_ISR (PIPE_C ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PORT_IMR ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_PORT_IER ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_PORT_IIR ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_PORT_ISR ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_MISC_IMR ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_MISC_IER ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_MISC_IIR ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_MISC_ISR ,D_BDW_PLUS ); +MMIO_D (GEN8_PCU_IMR ,D_BDW_PLUS ); +MMIO_D (GEN8_PCU_IER ,D_BDW_PLUS ); +MMIO_D (GEN8_PCU_IIR ,D_BDW_PLUS ); +MMIO_D (GEN8_PCU_ISR ,D_BDW_PLUS ); +MMIO_D (GEN8_MASTER_IRQ ,D_BDW_PLUS ); +MMIO_RING_D (RING_ACTHD_UDW ,D_BDW_PLUS ); + +#define RING_REG (base) _MMIO((base) + 0xd0) +MMIO_RING_F (RING_REG ,4 ,F_RO ,0 , + ~_MASKED_BIT_ENABLE (RESET_CTL_REQUEST_RESET ),D_BDW_PLUS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x230) +MMIO_RING_D (RING_REG ,D_BDW_PLUS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x234) +MMIO_RING_F (RING_REG ,8 ,F_RO ,0 , ~0 ,D_BDW_PLUS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x244) +MMIO_RING_DF (RING_REG ,D_BDW_PLUS ,F_CMD_ACCESS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x370) +MMIO_RING_F (RING_REG ,48 ,F_RO ,0 , ~0 ,D_BDW_PLUS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x3a0)Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/gvt/mmio_table.h new file +58
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
---end quoted text---
Part of the diff is not shown here. View the raw message.
Hi Christoph:
I am going to send it today or tomorrow. I had been testing it with QA since last week. I would like to discuss two comments you mentioned:
1) About having the mmio_table.h, I would like to keep the stuff in a dedicated header as putting them in intel_gvt.h might needs i915 guys to maintain it.
2) The other one is about if we should move the mmio_table.c into i915 folder. I guess we need the some comments from Jani. In the current version that I am testing, it's still in GVT folder. Guess we can submit a patch to move it to i915 folder later if Jani is ok about that.
The rest of your comments had been addressed.
Thanks,
Zhi.
-----Original Message-----
From: Christoph Hellwig <[email protected]>
Sent: Monday, February 7, 2022 9:33 AM
To: Zhi Wang <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Joonas Lahtinen <[email protected]>; Vivi, Rodrigo <[email protected]>; Zhenyu Wang <[email protected]>; Wang, Zhi A <[email protected]>; Xu, Terrence <[email protected]>
Subject: Re: [PATCH 1/3] i915/gvt: Introduce the mmio_table.c to support VFIO new mdev API
Any comments on my suggestions? Should I help to implement them?
Quoted 3,697 lines · Zhi Wang
From: Zhi Wang <[email protected]>
To support the new mdev interfaces and the re-factor patches from Christoph, which moves the GVT-g code into a dedicated module, the GVT-g initialization path has to be separated into two phases:
a) Early initialization.
The early initialization of GVT requires to be done when loading i915. Mostly it's because the initial clean HW state needs to be saved before i915 touches the HW.
b) Late initalization.
This phases of initalization will setup the rest components of GVT-g, which can be done later when the dedicated module is being loaded.
v5:
- Re-design the mmio table framework. (Chirstoph)
v4:
- Fix the errors of patch checking scripts.
v3:
- Fix the errors when
CONFIG_DRM_I915_WERRORis turned on. (Jani)v2:
- Implement a mmio table instead of generating it by marco in i915. (Jani)
Cc Christoph Hellwig <[email protected]>Cc Jason Gunthorpe <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Vivi Rodrigo <[email protected]>Cc Zhenyu Wang <[email protected]>Cc Zhi Wang <[email protected]>Tested-by Terrence Xu <[email protected]>Signed-off-by Zhi Wang <[email protected]>--- drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- drivers/gpu/drm/i915/gvt/gvt.c | 19 +- drivers/gpu/drm/i915/gvt/gvt.h | 21 +- drivers/gpu/drm/i915/gvt/handlers.c | 1878 +++++-------------------- drivers/gpu/drm/i915/gvt/mmio.h | 2 - drivers/gpu/drm/i915/gvt/mmio_table.c | 1386 ++++++++++++++++++ drivers/gpu/drm/i915/gvt/mmio_table.h | 58 + drivers/gpu/drm/i915/gvt/reg.h | 9 +- 9 files changed, 1796 insertions(+), 1581 deletions(-) create mode 100644 drivers/gpu/drm/i915/gvt/mmio_table.c create mode 100644 drivers/gpu/drm/i915/gvt/mmio_table.hdrivers/gpu/drm/i915/Makefile +1
-1@@ -318,7 +318,7 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ i915-y += i915_vgpu.o ifeq ($(CONFIG_DRM_I915_GVT),y) -i915-y += intel_gvt.o +i915-y += intel_gvt.o gvt/mmio_table.o include $(src)/gvt/Makefile endifdrivers/gpu/drm/i915/gvt/cmd_parser.c +1
-1@@ -3205,7 +3205,7 @@ int intel_gvt_scan_engine_context(struct intel_vgpu_workload *workload)static int init_cmd_table (struct intel_gvt *gvt) { -unsigned int gen_type =intel_gvt_get_device_type (gvt); +unsigned int gen_type =intel_gvt_get_device_type (gvt->gt->i915);int i;for (i =0 ; i <ARRAY_SIZE (cmd_info); i++) {drivers/gpu/drm/i915/gvt/gvt.c +1
-18@@ -63,23 +63,6 @@ static const struct intel_gvt_ops intel_gvt_ops = { .emulate_hotplug = intel_vgpu_emulate_hotplug, }; -static void init_device_info (struct intel_gvt *gvt) -{ -struct intel_gvt_device_info *info = &gvt->device_info; -struct pci_dev *pdev =to_pci_dev (gvt->gt->i915->drm.dev); - - info->max_support_vgpus =8 ; - info->cfg_space_size =PCI_CFG_SPACE_EXP_SIZE ; - info->mmio_size =2 *1024 *1024 ; - info->mmio_bar =0 ; - info->gtt_start_offset =8 *1024 *1024 ; - info->gtt_entry_size =8 ; - info->gtt_entry_size_shift =3 ; - info->gmadr_bytes_in_cmd =8 ; - info->max_surface_size =36 *1024 *1024 ; - info->msi_cap_offset = pdev->msi_cap; -} -static void intel_gvt_test_and_emulate_vblank (struct intel_gvt *gvt) {struct intel_vgpu *vgpu;@@ -208,7 +191,7 @@ int intel_gvt_init_device(struct drm_i915_private *i915) gvt->gt =to_gt (i915); i915->gvt = gvt; -init_device_info (gvt); +intel_gvt_init_device_info (i915, &gvt->device_info); ret =intel_gvt_setup_mmio_info (gvt);if (ret)drivers/gpu/drm/i915/gvt/gvt.h +4
-17@@ -40,6 +40,7 @@#include "debug.h" #include "hypercall.h" #include "mmio.h" +#include "mmio_table.h" #include "reg.h" #include "interrupt.h" #include "gtt.h" @@ -65,20 +66,6 @@ struct intel_gvt_host {extern struct intel_gvt_host intel_gvt_host; -/* Describe per-platform limitations. */ -struct intel_gvt_device_info { -u32 max_support_vgpus; -u32 cfg_space_size; -u32 mmio_size; -u32 mmio_bar; -unsigned long msi_cap_offset; -u32 gtt_start_offset; -u32 gtt_entry_size; -u32 gtt_entry_size_shift; -int gmadr_bytes_in_cmd; -u32 max_surface_size; -}; -/* GM resources owned by a vGPU */ struct intel_vgpu_gm {u64 aperture_sz;@@ -239,9 +226,9 @@ struct intel_gvt_fence { };/* Special MMIO blocks. */ -struct gvt_mmio_block { +struct intel_gvt_mmio_block {unsigned int device; -i915_reg_t offset; +u32 offset;unsigned int size;gvt_mmio_func read;gvt_mmio_func write;@@ -272,7 +259,7 @@ struct intel_gvt_mmio {/* Value of command write of this reg needs to be patched */ #define F_CMD_WRITE_PATCH (1 << 8) -const struct gvt_mmio_block *mmio_block; +struct intel_gvt_mmio_block *mmio_block;unsigned int num_mmio_block;DECLARE_HASHTABLE (mmio_info_table,INTEL_GVT_MMIO_HASH_BITS );drivers/gpu/drm/i915/gvt/handlers.c +337
-1541@@ -42,35 +42,10 @@#include "display/intel_display_types.h" #include "display/intel_fbc.h" -/* XXX FIXME i915 has changed PP_XXX definition */ -#define PCH_PP_STATUS _MMIO(0xc7200) -#define PCH_PP_CONTROL _MMIO(0xc7204) -#define PCH_PP_ON_DELAYS _MMIO(0xc7208) -#define PCH_PP_OFF_DELAYS _MMIO(0xc720c) -#define PCH_PP_DIVISOR _MMIO(0xc7210) - -unsigned long intel_gvt_get_device_type (struct intel_gvt *gvt) -{ -struct drm_i915_private *i915 = gvt->gt->i915; - -if (IS_BROADWELL (i915)) -return D_BDW ; -else if (IS_SKYLAKE (i915)) -return D_SKL ; -else if (IS_KABYLAKE (i915)) -return D_KBL ; -else if (IS_BROXTON (i915)) -return D_BXT ; -else if (IS_COFFEELAKE (i915) ||IS_COMETLAKE (i915)) -return D_CFL ; - -return 0 ; -} -bool intel_gvt_match_device (struct intel_gvt *gvt,unsigned long device) { -return intel_gvt_get_device_type (gvt) & device; +return intel_gvt_get_device_type (gvt->gt->i915) & device; } static void read_vreg(struct intel_vgpu *vgpu, unsigned int offset,@@ -97,12 +72,11 @@ struct intel_gvt_mmio_info *intel_gvt_find_mmio_info(struct intel_gvt *gvt,return NULL ; } -static int new_mmio_info (struct intel_gvt *gvt, -u32 offset,u16 flags,u32 size, -u32 addr_mask,u32 ro_mask,u32 device, +static int setup_mmio_handler (struct intel_gvt *gvt, +u32 offset,u32 size,u32 device,gvt_mmio_func read,gvt_mmio_func write) { -struct intel_gvt_mmio_info *info, *p; +struct intel_gvt_mmio_info *p;u32 start, end, i;if (!intel_gvt_match_device (gvt, device))@@ -115,32 +89,14 @@ static int new_mmio_info(struct intel_gvt *gvt, end = offset + size;for (i = start; i < end; i +=4 ) { - info =kzalloc (sizeof (*info),GFP_KERNEL ); -if (!info) -return -ENOMEM ; - - info->offset = i; - p =intel_gvt_find_mmio_info (gvt, info->offset); -if (p) { -WARN (1 ,"dup mmio definition offset %x\n" , - info->offset); -kfree (info); - -/* We return -EEXIST here to make GVT-g load fail. -* So duplicated MMIO can be found as soon as -* possible. -*/ -return -EEXIST ; + p =intel_gvt_find_mmio_info (gvt, i); +if (!p) { +WARN (1 ,"assign a handler to a non-tracked mmio %x\n" , + i); +return -ENODEV ; } - - info->ro_mask = ro_mask; - info->device = device; - info->read = read ? read : intel_vgpu_default_mmio_read; - info->write = write ? write : intel_vgpu_default_mmio_write; - gvt->mmio.mmio_attribute[info->offset /4 ] = flags; -INIT_HLIST_NODE (&info->node); -hash_add (gvt->mmio.mmio_info_table, &info->node, info->offset); - gvt->mmio.num_tracked_mmio++; + p->read = read ? read : intel_vgpu_default_mmio_read; + p->write = write ? write : intel_vgpu_default_mmio_write; }return 0 ; }@@ -2132,1516 +2088,266 @@ static int csfe_chicken1_mmio_write(struct intel_vgpu *vgpu,return 0 ; } -#define MMIO_F (reg, s, f, am, rm, d, r, w) do { \ - ret = new_mmio_info(gvt, i915_mmio_reg_offset(reg), \ - f, s, am, rm, d, r, w); \ +#define MMIO_F (reg, s, d, r, w) do { \ + ret = setup_mmio_handler(gvt, i915_mmio_reg_offset(reg), \ + s, d, r, w); \ if (ret) \ return ret; \ } while (0) -#define MMIO_D (reg, d) \ - MMIO_F(reg, 4, 0, 0, 0, d, NULL, NULL) +#define MMIO_H (reg, d, r, w) \ + MMIO_F(reg, d, 4, r, w) -#define MMIO_DH (reg, d, r, w) \ - MMIO_F(reg, 4, 0, 0, 0, d, r, w) - -#define MMIO_DFH (reg, d, f, r, w) \ - MMIO_F(reg, 4, f, 0, 0, d, r, w) - -#define MMIO_GM (reg, d, r, w) \ - MMIO_F(reg, 4, F_GMADR, 0xFFFFF000, 0, d, r, w) - -#define MMIO_GM_RDR (reg, d, r, w) \ - MMIO_F(reg, 4, F_GMADR | F_CMD_ACCESS, 0xFFFFF000, 0, d, r, w) - -#define MMIO_RO (reg, d, f, rm, r, w) \ - MMIO_F(reg, 4, F_RO | f, 0, rm, d, r, w) - -#define MMIO_RING_F (prefix, s, f, am, rm, d, r, w) do { \ - MMIO_F(prefix(RENDER_RING_BASE), s, f, am, rm, d, r, w); \ - MMIO_F(prefix(BLT_RING_BASE), s, f, am, rm, d, r, w); \ - MMIO_F(prefix(GEN6_BSD_RING_BASE), s, f, am, rm, d, r, w); \ - MMIO_F(prefix(VEBOX_RING_BASE), s, f, am, rm, d, r, w); \ +#define MMIO_RING_F (prefix, s, d, r, w) do { \ + MMIO_F(prefix(RENDER_RING_BASE), s, d, r, w); \ + MMIO_F(prefix(BLT_RING_BASE), s, d, r, w); \ + MMIO_F(prefix(GEN6_BSD_RING_BASE), s, d, r, w); \ + MMIO_F(prefix(VEBOX_RING_BASE), s, d, r, w); \ if (HAS_ENGINE(gvt->gt, VCS1)) \ - MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, f, am, rm, d, r, w); \ + MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, d, r, w); \ } while (0) -#define MMIO_RING_D (prefix, d) \ - MMIO_RING_F(prefix, 4, 0, 0, 0, d, NULL, NULL) +#define MMIO_RING_H (prefix, d, r, w) \ + MMIO_RING_F(prefix, 4, d, r, w) -#define MMIO_RING_DFH (prefix, d, f, r, w) \ - MMIO_RING_F(prefix, 4, f, 0, 0, d, r, w) - -#define MMIO_RING_GM (prefix, d, r, w) \ - MMIO_RING_F(prefix, 4, F_GMADR, 0xFFFF0000, 0, d, r, w) - -#define MMIO_RING_GM_RDR (prefix, d, r, w) \ - MMIO_RING_F(prefix, 4, F_GMADR | F_CMD_ACCESS, 0xFFFF0000, 0, d, r, w) - -#define MMIO_RING_RO (prefix, d, f, rm, r, w) \ - MMIO_RING_F(prefix, 4, F_RO | f, 0, rm, d, r, w) - -static int init_generic_mmio_info (struct intel_gvt *gvt) +static int init_generic_mmio_handlers (struct intel_gvt *gvt) {struct drm_i915_private *dev_priv = gvt->gt->i915;int ret; -MMIO_RING_DFH (RING_IMR ,D_ALL ,0 ,NULL , - intel_vgpu_reg_imr_handler); - -MMIO_DFH (SDEIMR ,D_ALL ,0 ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DFH (SDEIER ,D_ALL ,0 ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DFH (SDEIIR ,D_ALL ,0 ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (SDEISR ,D_ALL ); - -MMIO_RING_DFH (RING_HWSTAM ,D_ALL ,0 ,NULL ,NULL ); - - -MMIO_DH (GEN8_GAMW_ECO_DEV_RW_IA ,D_BDW_PLUS ,NULL , - gamw_echo_dev_rw_ia_write); - -MMIO_GM_RDR (BSD_HWS_PGA_GEN7 ,D_ALL ,NULL ,NULL ); -MMIO_GM_RDR (BLT_HWS_PGA_GEN7 ,D_ALL ,NULL ,NULL ); -MMIO_GM_RDR (VEBOX_HWS_PGA_GEN7 ,D_ALL ,NULL ,NULL ); - -#define RING_REG (base) _MMIO((base) + 0x28) -MMIO_RING_DFH (RING_REG ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -#undef RING_REG - -#define RING_REG (base) _MMIO((base) + 0x134) -MMIO_RING_DFH (RING_REG ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -#undef RING_REG +MMIO_RING_H (RING_IMR ,D_ALL ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (SDEIMR ,D_ALL ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (SDEIER ,D_ALL ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (SDEIIR ,D_ALL ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_GAMW_ECO_DEV_RW_IA ,D_BDW_PLUS ,NULL , gamw_echo_dev_rw_ia_write);#define RING_REG (base) _MMIO((base) + 0x6c) -MMIO_RING_DFH (RING_REG ,D_ALL ,0 , mmio_read_from_hw,NULL ); +MMIO_RING_H (RING_REG ,D_ALL , mmio_read_from_hw,NULL );#undef RING_REG -MMIO_DH (GEN7_SC_INSTDONE ,D_BDW_PLUS , mmio_read_from_hw,NULL ); - -MMIO_GM_RDR (_MMIO (0x2148 ),D_ALL ,NULL ,NULL ); -MMIO_GM_RDR (CCID (RENDER_RING_BASE ),D_ALL ,NULL ,NULL ); -MMIO_GM_RDR (_MMIO (0x12198 ),D_ALL ,NULL ,NULL ); -MMIO_D (GEN7_CXT_SIZE ,D_ALL ); - -MMIO_RING_DFH (RING_TAIL ,D_ALL ,0 ,NULL ,NULL ); -MMIO_RING_DFH (RING_HEAD ,D_ALL ,0 ,NULL ,NULL ); -MMIO_RING_DFH (RING_CTL ,D_ALL ,0 ,NULL ,NULL ); -MMIO_RING_DFH (RING_ACTHD ,D_ALL ,0 , mmio_read_from_hw,NULL ); -MMIO_RING_GM (RING_START ,D_ALL ,NULL ,NULL ); +MMIO_H (GEN7_SC_INSTDONE ,D_BDW_PLUS , mmio_read_from_hw,NULL ); +MMIO_RING_H (RING_ACTHD ,D_ALL , mmio_read_from_hw,NULL );/* RING MODE */ #define RING_REG (base) _MMIO((base) + 0x29c) -MMIO_RING_DFH (RING_REG ,D_ALL , -F_MODE_MASK |F_CMD_ACCESS |F_CMD_WRITE_PATCH ,NULL , - ring_mode_mmio_write); +MMIO_RING_H (RING_REG ,D_ALL ,NULL , ring_mode_mmio_write);#undef RING_REG -MMIO_RING_DFH (RING_MI_MODE ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_RING_DFH (RING_INSTPM ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_RING_DFH (RING_TIMESTAMP ,D_ALL ,F_CMD_ACCESS , - mmio_read_from_hw,NULL ); -MMIO_RING_DFH (RING_TIMESTAMP_UDW ,D_ALL ,F_CMD_ACCESS , - mmio_read_from_hw,NULL ); - -MMIO_DFH (GEN7_GT_MODE ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (CACHE_MODE_0_GEN7 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_DFH (CACHE_MODE_1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (CACHE_MODE_0 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2124 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DFH (_MMIO (0x20dc ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_3D_CHICKEN3,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2088 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (FF_SLICE_CS_CHICKEN2 ,D_ALL , -F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2470 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GAM_ECOCHK ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GEN7_COMMON_SLICE_CHICKEN1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_DFH (COMMON_SLICE_CHICKEN2 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_DFH (_MMIO (0x9030 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x20a0 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2420 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2430 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2434 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2438 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x243c ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x7018 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (HALF_SLICE_CHICKEN3 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GEN7_HALF_SLICE_CHICKEN1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); - -/* display */ -MMIO_F (_MMIO (0x60220 ),0x20 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_D (_MMIO (0x602a0 ),D_ALL ); - -MMIO_D (_MMIO (0x65050 ),D_ALL ); -MMIO_D (_MMIO (0x650b4 ),D_ALL ); - -MMIO_D (_MMIO (0xc4040 ),D_ALL ); -MMIO_D (DERRMR ,D_ALL ); - -MMIO_D (PIPEDSL (PIPE_A ),D_ALL ); -MMIO_D (PIPEDSL (PIPE_B ),D_ALL ); -MMIO_D (PIPEDSL (PIPE_C ),D_ALL ); -MMIO_D (PIPEDSL (_PIPE_EDP),D_ALL ); - -MMIO_DH (PIPECONF (PIPE_A ),D_ALL ,NULL , pipeconf_mmio_write); -MMIO_DH (PIPECONF (PIPE_B ),D_ALL ,NULL , pipeconf_mmio_write); -MMIO_DH (PIPECONF (PIPE_C ),D_ALL ,NULL , pipeconf_mmio_write); -MMIO_DH (PIPECONF (_PIPE_EDP),D_ALL ,NULL , pipeconf_mmio_write); - -MMIO_D (PIPESTAT (PIPE_A ),D_ALL ); -MMIO_D (PIPESTAT (PIPE_B ),D_ALL ); -MMIO_D (PIPESTAT (PIPE_C ),D_ALL ); -MMIO_D (PIPESTAT (_PIPE_EDP),D_ALL ); - -MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_A ),D_ALL ); -MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_B ),D_ALL ); -MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_C ),D_ALL ); -MMIO_D (PIPE_FLIPCOUNT_G4X (_PIPE_EDP),D_ALL ); - -MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_A ),D_ALL ); -MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_B ),D_ALL ); -MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_C ),D_ALL ); -MMIO_D (PIPE_FRMCOUNT_G4X (_PIPE_EDP),D_ALL ); - -MMIO_D (CURCNTR (PIPE_A ),D_ALL ); -MMIO_D (CURCNTR (PIPE_B ),D_ALL ); -MMIO_D (CURCNTR (PIPE_C ),D_ALL ); - -MMIO_D (CURPOS (PIPE_A ),D_ALL ); -MMIO_D (CURPOS (PIPE_B ),D_ALL ); -MMIO_D (CURPOS (PIPE_C ),D_ALL ); - -MMIO_D (CURBASE (PIPE_A ),D_ALL ); -MMIO_D (CURBASE (PIPE_B ),D_ALL ); -MMIO_D (CURBASE (PIPE_C ),D_ALL ); - -MMIO_D (CUR_FBC_CTL (PIPE_A ),D_ALL ); -MMIO_D (CUR_FBC_CTL (PIPE_B ),D_ALL ); -MMIO_D (CUR_FBC_CTL (PIPE_C ),D_ALL ); - -MMIO_D (_MMIO (0x700ac ),D_ALL ); -MMIO_D (_MMIO (0x710ac ),D_ALL ); -MMIO_D (_MMIO (0x720ac ),D_ALL ); - -MMIO_D (_MMIO (0x70090 ),D_ALL ); -MMIO_D (_MMIO (0x70094 ),D_ALL ); -MMIO_D (_MMIO (0x70098 ),D_ALL ); -MMIO_D (_MMIO (0x7009c ),D_ALL ); - -MMIO_D (DSPCNTR (PIPE_A ),D_ALL ); -MMIO_D (DSPADDR (PIPE_A ),D_ALL ); -MMIO_D (DSPSTRIDE (PIPE_A ),D_ALL ); -MMIO_D (DSPPOS (PIPE_A ),D_ALL ); -MMIO_D (DSPSIZE (PIPE_A ),D_ALL ); -MMIO_DH (DSPSURF (PIPE_A ),D_ALL ,NULL , pri_surf_mmio_write); -MMIO_D (DSPOFFSET (PIPE_A ),D_ALL ); -MMIO_D (DSPSURFLIVE (PIPE_A ),D_ALL ); -MMIO_DH (REG_50080 (PIPE_A ,PLANE_PRIMARY ),D_ALL ,NULL , - reg50080_mmio_write); - -MMIO_D (DSPCNTR (PIPE_B ),D_ALL ); -MMIO_D (DSPADDR (PIPE_B ),D_ALL ); -MMIO_D (DSPSTRIDE (PIPE_B ),D_ALL ); -MMIO_D (DSPPOS (PIPE_B ),D_ALL ); -MMIO_D (DSPSIZE (PIPE_B ),D_ALL ); -MMIO_DH (DSPSURF (PIPE_B ),D_ALL ,NULL , pri_surf_mmio_write); -MMIO_D (DSPOFFSET (PIPE_B ),D_ALL ); -MMIO_D (DSPSURFLIVE (PIPE_B ),D_ALL ); -MMIO_DH (REG_50080 (PIPE_B ,PLANE_PRIMARY ),D_ALL ,NULL , - reg50080_mmio_write); - -MMIO_D (DSPCNTR (PIPE_C ),D_ALL ); -MMIO_D (DSPADDR (PIPE_C ),D_ALL ); -MMIO_D (DSPSTRIDE (PIPE_C ),D_ALL ); -MMIO_D (DSPPOS (PIPE_C ),D_ALL ); -MMIO_D (DSPSIZE (PIPE_C ),D_ALL ); -MMIO_DH (DSPSURF (PIPE_C ),D_ALL ,NULL , pri_surf_mmio_write); -MMIO_D (DSPOFFSET (PIPE_C ),D_ALL ); -MMIO_D (DSPSURFLIVE (PIPE_C ),D_ALL ); -MMIO_DH (REG_50080 (PIPE_C ,PLANE_PRIMARY ),D_ALL ,NULL , - reg50080_mmio_write); - -MMIO_D (SPRCTL (PIPE_A ),D_ALL ); -MMIO_D (SPRLINOFF (PIPE_A ),D_ALL ); -MMIO_D (SPRSTRIDE (PIPE_A ),D_ALL ); -MMIO_D (SPRPOS (PIPE_A ),D_ALL ); -MMIO_D (SPRSIZE (PIPE_A ),D_ALL ); -MMIO_D (SPRKEYVAL (PIPE_A ),D_ALL ); -MMIO_D (SPRKEYMSK (PIPE_A ),D_ALL ); -MMIO_DH (SPRSURF (PIPE_A ),D_ALL ,NULL , spr_surf_mmio_write); -MMIO_D (SPRKEYMAX (PIPE_A ),D_ALL ); -MMIO_D (SPROFFSET (PIPE_A ),D_ALL ); -MMIO_D (SPRSCALE (PIPE_A ),D_ALL ); -MMIO_D (SPRSURFLIVE (PIPE_A ),D_ALL ); -MMIO_DH (REG_50080 (PIPE_A ,PLANE_SPRITE0 ),D_ALL ,NULL , - reg50080_mmio_write); - -MMIO_D (SPRCTL (PIPE_B ),D_ALL ); -MMIO_D (SPRLINOFF (PIPE_B ),D_ALL ); -MMIO_D (SPRSTRIDE (PIPE_B ),D_ALL ); -MMIO_D (SPRPOS (PIPE_B ),D_ALL ); -MMIO_D (SPRSIZE (PIPE_B ),D_ALL ); -MMIO_D (SPRKEYVAL (PIPE_B ),D_ALL ); -MMIO_D (SPRKEYMSK (PIPE_B ),D_ALL ); -MMIO_DH (SPRSURF (PIPE_B ),D_ALL ,NULL , spr_surf_mmio_write); -MMIO_D (SPRKEYMAX (PIPE_B ),D_ALL ); -MMIO_D (SPROFFSET (PIPE_B ),D_ALL ); -MMIO_D (SPRSCALE (PIPE_B ),D_ALL ); -MMIO_D (SPRSURFLIVE (PIPE_B ),D_ALL ); -MMIO_DH (REG_50080 (PIPE_B ,PLANE_SPRITE0 ),D_ALL ,NULL , - reg50080_mmio_write); - -MMIO_D (SPRCTL (PIPE_C ),D_ALL ); -MMIO_D (SPRLINOFF (PIPE_C ),D_ALL ); -MMIO_D (SPRSTRIDE (PIPE_C ),D_ALL ); -MMIO_D (SPRPOS (PIPE_C ),D_ALL ); -MMIO_D (SPRSIZE (PIPE_C ),D_ALL ); -MMIO_D (SPRKEYVAL (PIPE_C ),D_ALL ); -MMIO_D (SPRKEYMSK (PIPE_C ),D_ALL ); -MMIO_DH (SPRSURF (PIPE_C ),D_ALL ,NULL , spr_surf_mmio_write); -MMIO_D (SPRKEYMAX (PIPE_C ),D_ALL ); -MMIO_D (SPROFFSET (PIPE_C ),D_ALL ); -MMIO_D (SPRSCALE (PIPE_C ),D_ALL ); -MMIO_D (SPRSURFLIVE (PIPE_C ),D_ALL ); -MMIO_DH (REG_50080 (PIPE_C ,PLANE_SPRITE0 ),D_ALL ,NULL , - reg50080_mmio_write); - -MMIO_D (HTOTAL (TRANSCODER_A ),D_ALL ); -MMIO_D (HBLANK (TRANSCODER_A ),D_ALL ); -MMIO_D (HSYNC (TRANSCODER_A ),D_ALL ); -MMIO_D (VTOTAL (TRANSCODER_A ),D_ALL ); -MMIO_D (VBLANK (TRANSCODER_A ),D_ALL ); -MMIO_D (VSYNC (TRANSCODER_A ),D_ALL ); -MMIO_D (BCLRPAT (TRANSCODER_A ),D_ALL ); -MMIO_D (VSYNCSHIFT (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPESRC (TRANSCODER_A ),D_ALL ); - -MMIO_D (HTOTAL (TRANSCODER_B ),D_ALL ); -MMIO_D (HBLANK (TRANSCODER_B ),D_ALL ); -MMIO_D (HSYNC (TRANSCODER_B ),D_ALL ); -MMIO_D (VTOTAL (TRANSCODER_B ),D_ALL ); -MMIO_D (VBLANK (TRANSCODER_B ),D_ALL ); -MMIO_D (VSYNC (TRANSCODER_B ),D_ALL ); -MMIO_D (BCLRPAT (TRANSCODER_B ),D_ALL ); -MMIO_D (VSYNCSHIFT (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPESRC (TRANSCODER_B ),D_ALL ); - -MMIO_D (HTOTAL (TRANSCODER_C ),D_ALL ); -MMIO_D (HBLANK (TRANSCODER_C ),D_ALL ); -MMIO_D (HSYNC (TRANSCODER_C ),D_ALL ); -MMIO_D (VTOTAL (TRANSCODER_C ),D_ALL ); -MMIO_D (VBLANK (TRANSCODER_C ),D_ALL ); -MMIO_D (VSYNC (TRANSCODER_C ),D_ALL ); -MMIO_D (BCLRPAT (TRANSCODER_C ),D_ALL ); -MMIO_D (VSYNCSHIFT (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPESRC (TRANSCODER_C ),D_ALL ); - -MMIO_D (HTOTAL (TRANSCODER_EDP ),D_ALL ); -MMIO_D (HBLANK (TRANSCODER_EDP ),D_ALL ); -MMIO_D (HSYNC (TRANSCODER_EDP ),D_ALL ); -MMIO_D (VTOTAL (TRANSCODER_EDP ),D_ALL ); -MMIO_D (VBLANK (TRANSCODER_EDP ),D_ALL ); -MMIO_D (VSYNC (TRANSCODER_EDP ),D_ALL ); -MMIO_D (BCLRPAT (TRANSCODER_EDP ),D_ALL ); -MMIO_D (VSYNCSHIFT (TRANSCODER_EDP ),D_ALL ); - -MMIO_D (PIPE_DATA_M1 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_DATA_N1 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_DATA_M2 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_DATA_N2 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_LINK_M1 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_LINK_N1 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_LINK_M2 (TRANSCODER_A ),D_ALL ); -MMIO_D (PIPE_LINK_N2 (TRANSCODER_A ),D_ALL ); - -MMIO_D (PIPE_DATA_M1 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_DATA_N1 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_DATA_M2 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_DATA_N2 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_LINK_M1 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_LINK_N1 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_LINK_M2 (TRANSCODER_B ),D_ALL ); -MMIO_D (PIPE_LINK_N2 (TRANSCODER_B ),D_ALL ); - -MMIO_D (PIPE_DATA_M1 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_DATA_N1 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_DATA_M2 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_DATA_N2 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_LINK_M1 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_LINK_N1 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_LINK_M2 (TRANSCODER_C ),D_ALL ); -MMIO_D (PIPE_LINK_N2 (TRANSCODER_C ),D_ALL ); - -MMIO_D (PIPE_DATA_M1 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_DATA_N1 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_DATA_M2 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_DATA_N2 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_LINK_M1 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_LINK_N1 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_LINK_M2 (TRANSCODER_EDP ),D_ALL ); -MMIO_D (PIPE_LINK_N2 (TRANSCODER_EDP ),D_ALL ); - -MMIO_D (PF_CTL (PIPE_A ),D_ALL ); -MMIO_D (PF_WIN_SZ (PIPE_A ),D_ALL ); -MMIO_D (PF_WIN_POS (PIPE_A ),D_ALL ); -MMIO_D (PF_VSCALE (PIPE_A ),D_ALL ); -MMIO_D (PF_HSCALE (PIPE_A ),D_ALL ); - -MMIO_D (PF_CTL (PIPE_B ),D_ALL ); -MMIO_D (PF_WIN_SZ (PIPE_B ),D_ALL ); -MMIO_D (PF_WIN_POS (PIPE_B ),D_ALL ); -MMIO_D (PF_VSCALE (PIPE_B ),D_ALL ); -MMIO_D (PF_HSCALE (PIPE_B ),D_ALL ); - -MMIO_D (PF_CTL (PIPE_C ),D_ALL ); -MMIO_D (PF_WIN_SZ (PIPE_C ),D_ALL ); -MMIO_D (PF_WIN_POS (PIPE_C ),D_ALL ); -MMIO_D (PF_VSCALE (PIPE_C ),D_ALL ); -MMIO_D (PF_HSCALE (PIPE_C ),D_ALL ); - -MMIO_D (WM0_PIPE_ILK (PIPE_A ),D_ALL ); -MMIO_D (WM0_PIPE_ILK (PIPE_B ),D_ALL ); -MMIO_D (WM0_PIPE_ILK (PIPE_C ),D_ALL ); -MMIO_D (WM1_LP_ILK ,D_ALL ); -MMIO_D (WM2_LP_ILK ,D_ALL ); -MMIO_D (WM3_LP_ILK ,D_ALL ); -MMIO_D (WM1S_LP_ILK ,D_ALL ); -MMIO_D (WM2S_LP_IVB ,D_ALL ); -MMIO_D (WM3S_LP_IVB ,D_ALL ); - -MMIO_D (BLC_PWM_CPU_CTL2 ,D_ALL ); -MMIO_D (BLC_PWM_CPU_CTL ,D_ALL ); -MMIO_D (BLC_PWM_PCH_CTL1 ,D_ALL ); -MMIO_D (BLC_PWM_PCH_CTL2 ,D_ALL ); - -MMIO_D (_MMIO (0x48268 ),D_ALL ); - -MMIO_F (PCH_GMBUS0 ,4 *4 ,0 ,0 ,0 ,D_ALL , gmbus_mmio_read, - gmbus_mmio_write); -MMIO_F (PCH_GPIO_BASE ,6 *4 ,F_UNALIGN ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0xe4f00 ),0x28 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_F (_MMIO (_PCH_DPB_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_PRE_SKL ,NULL , - dp_aux_ch_ctl_mmio_write); -MMIO_F (_MMIO (_PCH_DPC_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_PRE_SKL ,NULL , - dp_aux_ch_ctl_mmio_write); -MMIO_F (_MMIO (_PCH_DPD_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_PRE_SKL ,NULL , - dp_aux_ch_ctl_mmio_write); - -MMIO_DH (PCH_ADPA ,D_PRE_SKL ,NULL , pch_adpa_mmio_write); - -MMIO_DH (_MMIO (_PCH_TRANSACONF),D_ALL ,NULL , transconf_mmio_write); -MMIO_DH (_MMIO (_PCH_TRANSBCONF),D_ALL ,NULL , transconf_mmio_write); - -MMIO_DH (FDI_RX_IIR (PIPE_A ),D_ALL ,NULL , fdi_rx_iir_mmio_write); -MMIO_DH (FDI_RX_IIR (PIPE_B ),D_ALL ,NULL , fdi_rx_iir_mmio_write); -MMIO_DH (FDI_RX_IIR (PIPE_C ),D_ALL ,NULL , fdi_rx_iir_mmio_write); -MMIO_DH (FDI_RX_IMR (PIPE_A ),D_ALL ,NULL , update_fdi_rx_iir_status); -MMIO_DH (FDI_RX_IMR (PIPE_B ),D_ALL ,NULL , update_fdi_rx_iir_status); -MMIO_DH (FDI_RX_IMR (PIPE_C ),D_ALL ,NULL , update_fdi_rx_iir_status); -MMIO_DH (FDI_RX_CTL (PIPE_A ),D_ALL ,NULL , update_fdi_rx_iir_status); -MMIO_DH (FDI_RX_CTL (PIPE_B ),D_ALL ,NULL , update_fdi_rx_iir_status); -MMIO_DH (FDI_RX_CTL (PIPE_C ),D_ALL ,NULL , update_fdi_rx_iir_status); - -MMIO_D (_MMIO (_PCH_TRANS_HTOTAL_A),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_HBLANK_A),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_HSYNC_A),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VTOTAL_A),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VBLANK_A),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VSYNC_A),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VSYNCSHIFT_A),D_ALL ); - -MMIO_D (_MMIO (_PCH_TRANS_HTOTAL_B),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_HBLANK_B),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_HSYNC_B),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VTOTAL_B),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VBLANK_B),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VSYNC_B),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANS_VSYNCSHIFT_B),D_ALL ); - -MMIO_D (_MMIO (_PCH_TRANSA_DATA_M1),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_DATA_N1),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_DATA_M2),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_DATA_N2),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_LINK_M1),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_LINK_N1),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_LINK_M2),D_ALL ); -MMIO_D (_MMIO (_PCH_TRANSA_LINK_N2),D_ALL ); - -MMIO_D (TRANS_DP_CTL (PIPE_A ),D_ALL ); -MMIO_D (TRANS_DP_CTL (PIPE_B ),D_ALL ); -MMIO_D (TRANS_DP_CTL (PIPE_C ),D_ALL ); - -MMIO_D (TVIDEO_DIP_CTL (PIPE_A ),D_ALL ); -MMIO_D (TVIDEO_DIP_DATA (PIPE_A ),D_ALL ); -MMIO_D (TVIDEO_DIP_GCP (PIPE_A ),D_ALL ); - -MMIO_D (TVIDEO_DIP_CTL (PIPE_B ),D_ALL ); -MMIO_D (TVIDEO_DIP_DATA (PIPE_B ),D_ALL ); -MMIO_D (TVIDEO_DIP_GCP (PIPE_B ),D_ALL ); - -MMIO_D (TVIDEO_DIP_CTL (PIPE_C ),D_ALL ); -MMIO_D (TVIDEO_DIP_DATA (PIPE_C ),D_ALL ); -MMIO_D (TVIDEO_DIP_GCP (PIPE_C ),D_ALL ); - -MMIO_D (_MMIO (_FDI_RXA_MISC),D_ALL ); -MMIO_D (_MMIO (_FDI_RXB_MISC),D_ALL ); -MMIO_D (_MMIO (_FDI_RXA_TUSIZE1),D_ALL ); -MMIO_D (_MMIO (_FDI_RXA_TUSIZE2),D_ALL ); -MMIO_D (_MMIO (_FDI_RXB_TUSIZE1),D_ALL ); -MMIO_D (_MMIO (_FDI_RXB_TUSIZE2),D_ALL ); - -MMIO_DH (PCH_PP_CONTROL ,D_ALL ,NULL , pch_pp_control_mmio_write); -MMIO_D (PCH_PP_DIVISOR ,D_ALL ); -MMIO_D (PCH_PP_STATUS ,D_ALL ); -MMIO_D (PCH_LVDS ,D_ALL ); -MMIO_D (_MMIO (_PCH_DPLL_A),D_ALL ); -MMIO_D (_MMIO (_PCH_DPLL_B),D_ALL ); -MMIO_D (_MMIO (_PCH_FPA0),D_ALL ); -MMIO_D (_MMIO (_PCH_FPA1),D_ALL ); -MMIO_D (_MMIO (_PCH_FPB0),D_ALL ); -MMIO_D (_MMIO (_PCH_FPB1),D_ALL ); -MMIO_D (PCH_DREF_CONTROL ,D_ALL ); -MMIO_D (PCH_RAWCLK_FREQ ,D_ALL ); -MMIO_D (PCH_DPLL_SEL ,D_ALL ); - -MMIO_D (_MMIO (0x61208 ),D_ALL ); -MMIO_D (_MMIO (0x6120c ),D_ALL ); -MMIO_D (PCH_PP_ON_DELAYS ,D_ALL ); -MMIO_D (PCH_PP_OFF_DELAYS ,D_ALL ); - -MMIO_DH (_MMIO (0xe651c ),D_ALL , dpy_reg_mmio_read,NULL ); -MMIO_DH (_MMIO (0xe661c ),D_ALL , dpy_reg_mmio_read,NULL ); -MMIO_DH (_MMIO (0xe671c ),D_ALL , dpy_reg_mmio_read,NULL ); -MMIO_DH (_MMIO (0xe681c ),D_ALL , dpy_reg_mmio_read,NULL ); -MMIO_DH (_MMIO (0xe6c04 ),D_ALL , dpy_reg_mmio_read,NULL ); -MMIO_DH (_MMIO (0xe6e1c ),D_ALL , dpy_reg_mmio_read,NULL ); - -MMIO_RO (PCH_PORT_HOTPLUG ,D_ALL ,0 , -PORTA_HOTPLUG_STATUS_MASK - |PORTB_HOTPLUG_STATUS_MASK - |PORTC_HOTPLUG_STATUS_MASK - |PORTD_HOTPLUG_STATUS_MASK , -NULL ,NULL ); - -MMIO_DH (LCPLL_CTL ,D_ALL ,NULL , lcpll_ctl_mmio_write); -MMIO_D (FUSE_STRAP ,D_ALL ); -MMIO_D (DIGITAL_PORT_HOTPLUG_CNTRL ,D_ALL ); - -MMIO_D (DISP_ARB_CTL ,D_ALL ); -MMIO_D (DISP_ARB_CTL2 ,D_ALL ); - -MMIO_D (ILK_DISPLAY_CHICKEN1 ,D_ALL ); -MMIO_D (ILK_DISPLAY_CHICKEN2 ,D_ALL ); -MMIO_D (ILK_DSPCLK_GATE_D ,D_ALL ); - -MMIO_D (SOUTH_CHICKEN1 ,D_ALL ); -MMIO_DH (SOUTH_CHICKEN2 ,D_ALL ,NULL , south_chicken2_mmio_write); -MMIO_D (_MMIO (_TRANSA_CHICKEN1),D_ALL ); -MMIO_D (_MMIO (_TRANSB_CHICKEN1),D_ALL ); -MMIO_D (SOUTH_DSPCLK_GATE_D ,D_ALL ); -MMIO_D (_MMIO (_TRANSA_CHICKEN2),D_ALL ); -MMIO_D (_MMIO (_TRANSB_CHICKEN2),D_ALL ); - -MMIO_D (ILK_DPFC_CB_BASE (INTEL_FBC_A ),D_ALL ); -MMIO_D (ILK_DPFC_CONTROL (INTEL_FBC_A ),D_ALL ); -MMIO_D (ILK_DPFC_RECOMP_CTL (INTEL_FBC_A ),D_ALL ); -MMIO_D (ILK_DPFC_STATUS (INTEL_FBC_A ),D_ALL ); -MMIO_D (ILK_DPFC_FENCE_YOFF (INTEL_FBC_A ),D_ALL ); -MMIO_D (ILK_DPFC_CHICKEN (INTEL_FBC_A ),D_ALL ); -MMIO_D (ILK_FBC_RT_BASE ,D_ALL ); - -MMIO_D (IPS_CTL ,D_ALL ); - -MMIO_D (PIPE_CSC_COEFF_RY_GY (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BY (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_RU_GU (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BU (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_RV_GV (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BV (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_MODE (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_HI (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_ME (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_LO (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_HI (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_ME (PIPE_A ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_LO (PIPE_A ),D_ALL ); - -MMIO_D (PIPE_CSC_COEFF_RY_GY (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BY (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_RU_GU (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BU (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_RV_GV (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BV (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_MODE (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_HI (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_ME (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_LO (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_HI (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_ME (PIPE_B ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_LO (PIPE_B ),D_ALL ); - -MMIO_D (PIPE_CSC_COEFF_RY_GY (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BY (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_RU_GU (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BU (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_RV_GV (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_COEFF_BV (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_MODE (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_HI (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_ME (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_PREOFF_LO (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_HI (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_ME (PIPE_C ),D_ALL ); -MMIO_D (PIPE_CSC_POSTOFF_LO (PIPE_C ),D_ALL ); - -MMIO_D (PREC_PAL_INDEX (PIPE_A ),D_ALL ); -MMIO_D (PREC_PAL_DATA (PIPE_A ),D_ALL ); -MMIO_F (PREC_PAL_GC_MAX (PIPE_A ,0 ),4 *3 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_D (PREC_PAL_INDEX (PIPE_B ),D_ALL ); -MMIO_D (PREC_PAL_DATA (PIPE_B ),D_ALL ); -MMIO_F (PREC_PAL_GC_MAX (PIPE_B ,0 ),4 *3 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_D (PREC_PAL_INDEX (PIPE_C ),D_ALL ); -MMIO_D (PREC_PAL_DATA (PIPE_C ),D_ALL ); -MMIO_F (PREC_PAL_GC_MAX (PIPE_C ,0 ),4 *3 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_D (_MMIO (0x60110 ),D_ALL ); -MMIO_D (_MMIO (0x61110 ),D_ALL ); -MMIO_F (_MMIO (0x70400 ),0x40 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x71400 ),0x40 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x72400 ),0x40 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x70440 ),0xc ,0 ,0 ,0 ,D_PRE_SKL ,NULL ,NULL ); -MMIO_F (_MMIO (0x71440 ),0xc ,0 ,0 ,0 ,D_PRE_SKL ,NULL ,NULL ); -MMIO_F (_MMIO (0x72440 ),0xc ,0 ,0 ,0 ,D_PRE_SKL ,NULL ,NULL ); -MMIO_F (_MMIO (0x7044c ),0xc ,0 ,0 ,0 ,D_PRE_SKL ,NULL ,NULL ); -MMIO_F (_MMIO (0x7144c ),0xc ,0 ,0 ,0 ,D_PRE_SKL ,NULL ,NULL ); -MMIO_F (_MMIO (0x7244c ),0xc ,0 ,0 ,0 ,D_PRE_SKL ,NULL ,NULL ); - -MMIO_D (WM_LINETIME (PIPE_A ),D_ALL ); -MMIO_D (WM_LINETIME (PIPE_B ),D_ALL ); -MMIO_D (WM_LINETIME (PIPE_C ),D_ALL ); -MMIO_D (SPLL_CTL ,D_ALL ); -MMIO_D (_MMIO (_WRPLL_CTL1),D_ALL ); -MMIO_D (_MMIO (_WRPLL_CTL2),D_ALL ); -MMIO_D (PORT_CLK_SEL (PORT_A ),D_ALL ); -MMIO_D (PORT_CLK_SEL (PORT_B ),D_ALL ); -MMIO_D (PORT_CLK_SEL (PORT_C ),D_ALL ); -MMIO_D (PORT_CLK_SEL (PORT_D ),D_ALL ); -MMIO_D (PORT_CLK_SEL (PORT_E ),D_ALL ); -MMIO_D (TRANS_CLK_SEL (TRANSCODER_A ),D_ALL ); -MMIO_D (TRANS_CLK_SEL (TRANSCODER_B ),D_ALL ); -MMIO_D (TRANS_CLK_SEL (TRANSCODER_C ),D_ALL ); - -MMIO_D (HSW_NDE_RSTWRN_OPT ,D_ALL ); -MMIO_D (_MMIO (0x46508 ),D_ALL ); - -MMIO_D (_MMIO (0x49080 ),D_ALL ); -MMIO_D (_MMIO (0x49180 ),D_ALL ); -MMIO_D (_MMIO (0x49280 ),D_ALL ); - -MMIO_F (_MMIO (0x49090 ),0x14 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x49190 ),0x14 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x49290 ),0x14 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_D (GAMMA_MODE (PIPE_A ),D_ALL ); -MMIO_D (GAMMA_MODE (PIPE_B ),D_ALL ); -MMIO_D (GAMMA_MODE (PIPE_C ),D_ALL ); - -MMIO_D (PIPE_MULT (PIPE_A ),D_ALL ); -MMIO_D (PIPE_MULT (PIPE_B ),D_ALL ); -MMIO_D (PIPE_MULT (PIPE_C ),D_ALL ); - -MMIO_D (HSW_TVIDEO_DIP_CTL (TRANSCODER_A ),D_ALL ); -MMIO_D (HSW_TVIDEO_DIP_CTL (TRANSCODER_B ),D_ALL ); -MMIO_D (HSW_TVIDEO_DIP_CTL (TRANSCODER_C ),D_ALL ); - -MMIO_DH (SFUSE_STRAP ,D_ALL ,NULL ,NULL ); -MMIO_D (SBI_ADDR ,D_ALL ); -MMIO_DH (SBI_DATA ,D_ALL , sbi_data_mmio_read,NULL ); -MMIO_DH (SBI_CTL_STAT ,D_ALL ,NULL , sbi_ctl_mmio_write); -MMIO_D (PIXCLK_GATE ,D_ALL ); - -MMIO_F (_MMIO (_DPA_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_ALL ,NULL , - dp_aux_ch_ctl_mmio_write); - -MMIO_DH (DDI_BUF_CTL (PORT_A ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); -MMIO_DH (DDI_BUF_CTL (PORT_B ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); -MMIO_DH (DDI_BUF_CTL (PORT_C ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); -MMIO_DH (DDI_BUF_CTL (PORT_D ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); -MMIO_DH (DDI_BUF_CTL (PORT_E ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); - -MMIO_DH (DP_TP_CTL (PORT_A ),D_ALL ,NULL , dp_tp_ctl_mmio_write); -MMIO_DH (DP_TP_CTL (PORT_B ),D_ALL ,NULL , dp_tp_ctl_mmio_write); -MMIO_DH (DP_TP_CTL (PORT_C ),D_ALL ,NULL , dp_tp_ctl_mmio_write); -MMIO_DH (DP_TP_CTL (PORT_D ),D_ALL ,NULL , dp_tp_ctl_mmio_write); -MMIO_DH (DP_TP_CTL (PORT_E ),D_ALL ,NULL , dp_tp_ctl_mmio_write); - -MMIO_DH (DP_TP_STATUS (PORT_A ),D_ALL ,NULL , dp_tp_status_mmio_write); -MMIO_DH (DP_TP_STATUS (PORT_B ),D_ALL ,NULL , dp_tp_status_mmio_write); -MMIO_DH (DP_TP_STATUS (PORT_C ),D_ALL ,NULL , dp_tp_status_mmio_write); -MMIO_DH (DP_TP_STATUS (PORT_D ),D_ALL ,NULL , dp_tp_status_mmio_write); -MMIO_DH (DP_TP_STATUS (PORT_E ),D_ALL ,NULL ,NULL ); - -MMIO_F (_MMIO (_DDI_BUF_TRANS_A),0x50 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x64e60 ),0x50 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x64eC0 ),0x50 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x64f20 ),0x50 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x64f80 ),0x50 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_D (HSW_AUD_CFG (PIPE_A ),D_ALL ); -MMIO_D (HSW_AUD_PIN_ELD_CP_VLD ,D_ALL ); -MMIO_D (HSW_AUD_MISC_CTRL (PIPE_A ),D_ALL ); - -MMIO_DH (_MMIO (_TRANS_DDI_FUNC_CTL_A),D_ALL ,NULL ,NULL ); -MMIO_DH (_MMIO (_TRANS_DDI_FUNC_CTL_B),D_ALL ,NULL ,NULL ); -MMIO_DH (_MMIO (_TRANS_DDI_FUNC_CTL_C),D_ALL ,NULL ,NULL ); -MMIO_DH (_MMIO (_TRANS_DDI_FUNC_CTL_EDP),D_ALL ,NULL ,NULL ); - -MMIO_D (_MMIO (_TRANSA_MSA_MISC),D_ALL ); -MMIO_D (_MMIO (_TRANSB_MSA_MISC),D_ALL ); -MMIO_D (_MMIO (_TRANSC_MSA_MISC),D_ALL ); -MMIO_D (_MMIO (_TRANS_EDP_MSA_MISC),D_ALL ); - -MMIO_DH (FORCEWAKE ,D_ALL ,NULL ,NULL ); -MMIO_D (FORCEWAKE_ACK ,D_ALL ); -MMIO_D (GEN6_GT_CORE_STATUS ,D_ALL ); -MMIO_D (GEN6_GT_THREAD_STATUS_REG ,D_ALL ); -MMIO_DFH (GTFIFODBG ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GTFIFOCTL ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DH (FORCEWAKE_MT ,D_PRE_SKL ,NULL , mul_force_wake_write); -MMIO_DH (FORCEWAKE_ACK_HSW ,D_BDW ,NULL ,NULL ); -MMIO_D (ECOBUS ,D_ALL ); -MMIO_DH (GEN6_RC_CONTROL ,D_ALL ,NULL ,NULL ); -MMIO_DH (GEN6_RC_STATE ,D_ALL ,NULL ,NULL ); -MMIO_D (GEN6_RPNSWREQ ,D_ALL ); -MMIO_D (GEN6_RC_VIDEO_FREQ ,D_ALL ); -MMIO_D (GEN6_RP_DOWN_TIMEOUT ,D_ALL ); -MMIO_D (GEN6_RP_INTERRUPT_LIMITS ,D_ALL ); -MMIO_D (GEN6_RPSTAT1 ,D_ALL ); -MMIO_D (GEN6_RP_CONTROL ,D_ALL ); -MMIO_D (GEN6_RP_UP_THRESHOLD ,D_ALL ); -MMIO_D (GEN6_RP_DOWN_THRESHOLD ,D_ALL ); -MMIO_D (GEN6_RP_CUR_UP_EI ,D_ALL ); -MMIO_D (GEN6_RP_CUR_UP ,D_ALL ); -MMIO_D (GEN6_RP_PREV_UP ,D_ALL ); -MMIO_D (GEN6_RP_CUR_DOWN_EI ,D_ALL ); -MMIO_D (GEN6_RP_CUR_DOWN ,D_ALL ); -MMIO_D (GEN6_RP_PREV_DOWN ,D_ALL ); -MMIO_D (GEN6_RP_UP_EI ,D_ALL ); -MMIO_D (GEN6_RP_DOWN_EI ,D_ALL ); -MMIO_D (GEN6_RP_IDLE_HYSTERSIS ,D_ALL ); -MMIO_D (GEN6_RC1_WAKE_RATE_LIMIT ,D_ALL ); -MMIO_D (GEN6_RC6_WAKE_RATE_LIMIT ,D_ALL ); -MMIO_D (GEN6_RC6pp_WAKE_RATE_LIMIT,D_ALL ); -MMIO_D (GEN6_RC_EVALUATION_INTERVAL ,D_ALL ); -MMIO_D (GEN6_RC_IDLE_HYSTERSIS ,D_ALL ); -MMIO_D (GEN6_RC_SLEEP ,D_ALL ); -MMIO_D (GEN6_RC1e_THRESHOLD,D_ALL ); -MMIO_D (GEN6_RC6_THRESHOLD ,D_ALL ); -MMIO_D (GEN6_RC6p_THRESHOLD,D_ALL ); -MMIO_D (GEN6_RC6pp_THRESHOLD,D_ALL ); -MMIO_D (GEN6_PMINTRMSK ,D_ALL ); -MMIO_DH (HSW_PWR_WELL_CTL1 ,D_BDW ,NULL , power_well_ctl_mmio_write); -MMIO_DH (HSW_PWR_WELL_CTL2 ,D_BDW ,NULL , power_well_ctl_mmio_write); -MMIO_DH (HSW_PWR_WELL_CTL3 ,D_BDW ,NULL , power_well_ctl_mmio_write); -MMIO_DH (HSW_PWR_WELL_CTL4 ,D_BDW ,NULL , power_well_ctl_mmio_write); -MMIO_DH (HSW_PWR_WELL_CTL5 ,D_BDW ,NULL , power_well_ctl_mmio_write); -MMIO_DH (HSW_PWR_WELL_CTL6 ,D_BDW ,NULL , power_well_ctl_mmio_write); - -MMIO_D (RSTDBYCTL ,D_ALL ); - -MMIO_DH (GEN6_GDRST ,D_ALL ,NULL , gdrst_mmio_write); -MMIO_F (FENCE_REG_GEN6_LO (0 ),0x80 ,0 ,0 ,0 ,D_ALL , fence_mmio_read, fence_mmio_write); -MMIO_DH (CPU_VGACNTRL ,D_ALL ,NULL , vga_control_mmio_write); - -MMIO_D (TILECTL ,D_ALL ); - -MMIO_D (GEN6_UCGCTL1 ,D_ALL ); -MMIO_D (GEN6_UCGCTL2 ,D_ALL ); - -MMIO_F (_MMIO (0x4f000 ),0x90 ,0 ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_D (GEN6_PCODE_DATA ,D_ALL ); -MMIO_D (_MMIO (0x13812c ),D_ALL ); -MMIO_DH (GEN7_ERR_INT ,D_ALL ,NULL ,NULL ); -MMIO_D (HSW_EDRAM_CAP ,D_ALL ); -MMIO_D (HSW_IDICR ,D_ALL ); -MMIO_DH (GFX_FLSH_CNTL_GEN6 ,D_ALL ,NULL ,NULL ); - -MMIO_D (_MMIO (0x3c ),D_ALL ); -MMIO_D (_MMIO (0x860 ),D_ALL ); -MMIO_D (ECOSKPD (RENDER_RING_BASE ),D_ALL ); -MMIO_D (_MMIO (0x121d0 ),D_ALL ); -MMIO_D (ECOSKPD (BLT_RING_BASE ),D_ALL ); -MMIO_D (_MMIO (0x41d0 ),D_ALL ); -MMIO_D (GAC_ECO_BITS ,D_ALL ); -MMIO_D (_MMIO (0x6200 ),D_ALL ); -MMIO_D (_MMIO (0x6204 ),D_ALL ); -MMIO_D (_MMIO (0x6208 ),D_ALL ); -MMIO_D (_MMIO (0x7118 ),D_ALL ); -MMIO_D (_MMIO (0x7180 ),D_ALL ); -MMIO_D (_MMIO (0x7408 ),D_ALL ); -MMIO_D (_MMIO (0x7c00 ),D_ALL ); -MMIO_DH (GEN6_MBCTL ,D_ALL ,NULL , mbctl_write); -MMIO_D (_MMIO (0x911c ),D_ALL ); -MMIO_D (_MMIO (0x9120 ),D_ALL ); -MMIO_DFH (GEN7_UCGCTL4 ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_D (GAB_CTL ,D_ALL ); -MMIO_D (_MMIO (0x48800 ),D_ALL ); -MMIO_D (_MMIO (0xce044 ),D_ALL ); -MMIO_D (_MMIO (0xe6500 ),D_ALL ); -MMIO_D (_MMIO (0xe6504 ),D_ALL ); -MMIO_D (_MMIO (0xe6600 ),D_ALL ); -MMIO_D (_MMIO (0xe6604 ),D_ALL ); -MMIO_D (_MMIO (0xe6700 ),D_ALL ); -MMIO_D (_MMIO (0xe6704 ),D_ALL ); -MMIO_D (_MMIO (0xe6800 ),D_ALL ); -MMIO_D (_MMIO (0xe6804 ),D_ALL ); -MMIO_D (PCH_GMBUS4 ,D_ALL ); -MMIO_D (PCH_GMBUS5 ,D_ALL ); - -MMIO_D (_MMIO (0x902c ),D_ALL ); -MMIO_D (_MMIO (0xec008 ),D_ALL ); -MMIO_D (_MMIO (0xec00c ),D_ALL ); -MMIO_D (_MMIO (0xec008 +0x18 ),D_ALL ); -MMIO_D (_MMIO (0xec00c +0x18 ),D_ALL ); -MMIO_D (_MMIO (0xec008 +0x18 *2 ),D_ALL ); -MMIO_D (_MMIO (0xec00c +0x18 *2 ),D_ALL ); -MMIO_D (_MMIO (0xec008 +0x18 *3 ),D_ALL ); -MMIO_D (_MMIO (0xec00c +0x18 *3 ),D_ALL ); -MMIO_D (_MMIO (0xec408 ),D_ALL ); -MMIO_D (_MMIO (0xec40c ),D_ALL ); -MMIO_D (_MMIO (0xec408 +0x18 ),D_ALL ); -MMIO_D (_MMIO (0xec40c +0x18 ),D_ALL ); -MMIO_D (_MMIO (0xec408 +0x18 *2 ),D_ALL ); -MMIO_D (_MMIO (0xec40c +0x18 *2 ),D_ALL ); -MMIO_D (_MMIO (0xec408 +0x18 *3 ),D_ALL ); -MMIO_D (_MMIO (0xec40c +0x18 *3 ),D_ALL ); -MMIO_D (_MMIO (0xfc810 ),D_ALL ); -MMIO_D (_MMIO (0xfc81c ),D_ALL ); -MMIO_D (_MMIO (0xfc828 ),D_ALL ); -MMIO_D (_MMIO (0xfc834 ),D_ALL ); -MMIO_D (_MMIO (0xfcc00 ),D_ALL ); -MMIO_D (_MMIO (0xfcc0c ),D_ALL ); -MMIO_D (_MMIO (0xfcc18 ),D_ALL ); -MMIO_D (_MMIO (0xfcc24 ),D_ALL ); -MMIO_D (_MMIO (0xfd000 ),D_ALL ); -MMIO_D (_MMIO (0xfd00c ),D_ALL ); -MMIO_D (_MMIO (0xfd018 ),D_ALL ); -MMIO_D (_MMIO (0xfd024 ),D_ALL ); -MMIO_D (_MMIO (0xfd034 ),D_ALL ); - -MMIO_DH (FPGA_DBG ,D_ALL ,NULL , fpga_dbg_mmio_write); -MMIO_D (_MMIO (0x2054 ),D_ALL ); -MMIO_D (_MMIO (0x12054 ),D_ALL ); -MMIO_D (_MMIO (0x22054 ),D_ALL ); -MMIO_D (_MMIO (0x1a054 ),D_ALL ); - -MMIO_D (_MMIO (0x44070 ),D_ALL ); -MMIO_DFH (_MMIO (0x215c ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2178 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x217c ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x12178 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x1217c ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_F (_MMIO (0x2290 ),8 ,F_CMD_ACCESS ,0 ,0 ,D_BDW_PLUS ,NULL ,NULL ); -MMIO_D (_MMIO (0x2b00 ),D_BDW_PLUS ); -MMIO_D (_MMIO (0x2360 ),D_BDW_PLUS ); -MMIO_F (_MMIO (0x5200 ),32 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x5240 ),32 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (_MMIO (0x5280 ),16 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); - -MMIO_DFH (_MMIO (0x1c17c ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x1c178 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (BCS_SWCTRL ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_F (HS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (DS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (IA_VERTICES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (IA_PRIMITIVES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (VS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (GS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (GS_PRIMITIVES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (CL_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (CL_PRIMITIVES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (PS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_F (PS_DEPTH_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ,NULL ,NULL ); -MMIO_DH (_MMIO (0x4260 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); -MMIO_DH (_MMIO (0x4264 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); -MMIO_DH (_MMIO (0x4268 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); -MMIO_DH (_MMIO (0x426c ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); -MMIO_DH (_MMIO (0x4270 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); -MMIO_DFH (_MMIO (0x4094 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DFH (ARB_MODE ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_RING_GM (RING_BBADDR ,D_ALL ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2220 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x12220 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x22220 ),D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_RING_DFH (RING_SYNC_1 ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_RING_DFH (RING_SYNC_0 ,D_ALL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x22178 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x1a178 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x1a17c ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2217c ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DH (EDP_PSR_IMR ,D_BDW_PLUS ,NULL , edp_psr_imr_iir_write); -MMIO_DH (EDP_PSR_IIR ,D_BDW_PLUS ,NULL , edp_psr_imr_iir_write); -MMIO_DH (GUC_STATUS ,D_ALL , guc_status_read,NULL ); - -return 0 ; -} - -static int init_bdw_mmio_info (struct intel_gvt *gvt) +MMIO_RING_H (RING_TIMESTAMP ,D_ALL , mmio_read_from_hw,NULL ); +MMIO_RING_H (RING_TIMESTAMP_UDW ,D_ALL , mmio_read_from_hw,NULL ); +MMIO_H (PIPECONF (PIPE_A ),D_ALL ,NULL , pipeconf_mmio_write); +MMIO_H (PIPECONF (PIPE_B ),D_ALL ,NULL , pipeconf_mmio_write); +MMIO_H (PIPECONF (PIPE_C ),D_ALL ,NULL , pipeconf_mmio_write); +MMIO_H (PIPECONF (_PIPE_EDP),D_ALL ,NULL , pipeconf_mmio_write); +MMIO_H (DSPSURF (PIPE_A ),D_ALL ,NULL , pri_surf_mmio_write); +MMIO_H (REG_50080 (PIPE_A ,PLANE_PRIMARY ),D_ALL ,NULL , reg50080_mmio_write); +MMIO_H (DSPSURF (PIPE_B ),D_ALL ,NULL , pri_surf_mmio_write); +MMIO_H (REG_50080 (PIPE_B ,PLANE_PRIMARY ),D_ALL ,NULL , reg50080_mmio_write); +MMIO_H (DSPSURF (PIPE_C ),D_ALL ,NULL , pri_surf_mmio_write); +MMIO_H (REG_50080 (PIPE_C ,PLANE_PRIMARY ),D_ALL ,NULL , reg50080_mmio_write); +MMIO_H (SPRSURF (PIPE_A ),D_ALL ,NULL , spr_surf_mmio_write); +MMIO_H (REG_50080 (PIPE_A ,PLANE_SPRITE0 ),D_ALL ,NULL , reg50080_mmio_write); +MMIO_H (SPRSURF (PIPE_B ),D_ALL ,NULL , spr_surf_mmio_write); +MMIO_H (REG_50080 (PIPE_B ,PLANE_SPRITE0 ),D_ALL ,NULL , reg50080_mmio_write); +MMIO_H (SPRSURF (PIPE_C ),D_ALL ,NULL , spr_surf_mmio_write); +MMIO_H (REG_50080 (PIPE_C ,PLANE_SPRITE0 ),D_ALL ,NULL , reg50080_mmio_write); +MMIO_F (PCH_GMBUS0 ,4 *4 ,D_ALL , gmbus_mmio_read, gmbus_mmio_write); +MMIO_F (_MMIO (_PCH_DPB_AUX_CH_CTL),6 *4 ,D_PRE_SKL ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_F (_MMIO (_PCH_DPC_AUX_CH_CTL),6 *4 ,D_PRE_SKL ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_F (_MMIO (_PCH_DPD_AUX_CH_CTL),6 *4 ,D_PRE_SKL ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_H (PCH_ADPA ,D_PRE_SKL ,NULL , pch_adpa_mmio_write); +MMIO_H (_MMIO (_PCH_TRANSACONF),D_ALL ,NULL , transconf_mmio_write); +MMIO_H (_MMIO (_PCH_TRANSBCONF),D_ALL ,NULL , transconf_mmio_write); +MMIO_H (FDI_RX_IIR (PIPE_A ),D_ALL ,NULL , fdi_rx_iir_mmio_write); +MMIO_H (FDI_RX_IIR (PIPE_B ),D_ALL ,NULL , fdi_rx_iir_mmio_write); +MMIO_H (FDI_RX_IIR (PIPE_C ),D_ALL ,NULL , fdi_rx_iir_mmio_write); +MMIO_H (FDI_RX_IMR (PIPE_A ),D_ALL ,NULL , update_fdi_rx_iir_status); +MMIO_H (FDI_RX_IMR (PIPE_B ),D_ALL ,NULL , update_fdi_rx_iir_status); +MMIO_H (FDI_RX_IMR (PIPE_C ),D_ALL ,NULL , update_fdi_rx_iir_status); +MMIO_H (FDI_RX_CTL (PIPE_A ),D_ALL ,NULL , update_fdi_rx_iir_status); +MMIO_H (FDI_RX_CTL (PIPE_B ),D_ALL ,NULL , update_fdi_rx_iir_status); +MMIO_H (FDI_RX_CTL (PIPE_C ),D_ALL ,NULL , update_fdi_rx_iir_status); +MMIO_H (PCH_PP_CONTROL ,D_ALL ,NULL , pch_pp_control_mmio_write); +MMIO_H (_MMIO (0xe651c ),D_ALL , dpy_reg_mmio_read,NULL ); +MMIO_H (_MMIO (0xe661c ),D_ALL , dpy_reg_mmio_read,NULL ); +MMIO_H (_MMIO (0xe671c ),D_ALL , dpy_reg_mmio_read,NULL ); +MMIO_H (_MMIO (0xe681c ),D_ALL , dpy_reg_mmio_read,NULL ); +MMIO_H (_MMIO (0xe6c04 ),D_ALL , dpy_reg_mmio_read,NULL ); +MMIO_H (_MMIO (0xe6e1c ),D_ALL , dpy_reg_mmio_read,NULL ); +MMIO_H (LCPLL_CTL ,D_ALL ,NULL , lcpll_ctl_mmio_write); +MMIO_H (SOUTH_CHICKEN2 ,D_ALL ,NULL , south_chicken2_mmio_write); +MMIO_H (SBI_DATA ,D_ALL , sbi_data_mmio_read,NULL ); +MMIO_H (SBI_CTL_STAT ,D_ALL ,NULL , sbi_ctl_mmio_write); +MMIO_F (_MMIO (_DPA_AUX_CH_CTL),6 *4 ,D_ALL ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_H (DDI_BUF_CTL (PORT_A ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); +MMIO_H (DDI_BUF_CTL (PORT_B ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); +MMIO_H (DDI_BUF_CTL (PORT_C ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); +MMIO_H (DDI_BUF_CTL (PORT_D ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); +MMIO_H (DDI_BUF_CTL (PORT_E ),D_ALL ,NULL , ddi_buf_ctl_mmio_write); +MMIO_H (DP_TP_CTL (PORT_A ),D_ALL ,NULL , dp_tp_ctl_mmio_write); +MMIO_H (DP_TP_CTL (PORT_B ),D_ALL ,NULL , dp_tp_ctl_mmio_write); +MMIO_H (DP_TP_CTL (PORT_C ),D_ALL ,NULL , dp_tp_ctl_mmio_write); +MMIO_H (DP_TP_CTL (PORT_D ),D_ALL ,NULL , dp_tp_ctl_mmio_write); +MMIO_H (DP_TP_CTL (PORT_E ),D_ALL ,NULL , dp_tp_ctl_mmio_write); +MMIO_H (DP_TP_STATUS (PORT_A ),D_ALL ,NULL , dp_tp_status_mmio_write); +MMIO_H (DP_TP_STATUS (PORT_B ),D_ALL ,NULL , dp_tp_status_mmio_write); +MMIO_H (DP_TP_STATUS (PORT_C ),D_ALL ,NULL , dp_tp_status_mmio_write); +MMIO_H (DP_TP_STATUS (PORT_D ),D_ALL ,NULL , dp_tp_status_mmio_write); +MMIO_H (FORCEWAKE_MT ,D_PRE_SKL ,NULL , mul_force_wake_write); +MMIO_H (HSW_PWR_WELL_CTL1 ,D_BDW ,NULL , power_well_ctl_mmio_write); +MMIO_H (HSW_PWR_WELL_CTL2 ,D_BDW ,NULL , power_well_ctl_mmio_write); +MMIO_H (HSW_PWR_WELL_CTL3 ,D_BDW ,NULL , power_well_ctl_mmio_write); +MMIO_H (HSW_PWR_WELL_CTL4 ,D_BDW ,NULL , power_well_ctl_mmio_write); +MMIO_H (HSW_PWR_WELL_CTL5 ,D_BDW ,NULL , power_well_ctl_mmio_write); +MMIO_H (HSW_PWR_WELL_CTL6 ,D_BDW ,NULL , power_well_ctl_mmio_write); +MMIO_H (GEN6_GDRST ,D_ALL ,NULL , gdrst_mmio_write); +MMIO_F (FENCE_REG_GEN6_LO (0 ),0x80 ,D_ALL , fence_mmio_read, fence_mmio_write); +MMIO_H (CPU_VGACNTRL ,D_ALL ,NULL , vga_control_mmio_write); +MMIO_H (GEN6_MBCTL ,D_ALL ,NULL , mbctl_write); +MMIO_H (FPGA_DBG ,D_ALL ,NULL , fpga_dbg_mmio_write); +MMIO_H (_MMIO (0x4260 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); +MMIO_H (_MMIO (0x4264 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); +MMIO_H (_MMIO (0x4268 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); +MMIO_H (_MMIO (0x426c ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); +MMIO_H (_MMIO (0x4270 ),D_BDW_PLUS ,NULL , gvt_reg_tlb_control_handler); +MMIO_H (EDP_PSR_IMR ,D_BDW_PLUS ,NULL , edp_psr_imr_iir_write); +MMIO_H (EDP_PSR_IIR ,D_BDW_PLUS ,NULL , edp_psr_imr_iir_write); +MMIO_H (GUC_STATUS ,D_ALL , guc_status_read,NULL ); + +return 0 ; +} + +static int init_bdw_mmio_handlers (struct intel_gvt *gvt) { -struct drm_i915_private *dev_priv = gvt->gt->i915;int ret; -MMIO_DH (GEN8_GT_IMR (0 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_GT_IER (0 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_GT_IIR (0 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_GT_ISR (0 ),D_BDW_PLUS ); - -MMIO_DH (GEN8_GT_IMR (1 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_GT_IER (1 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_GT_IIR (1 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_GT_ISR (1 ),D_BDW_PLUS ); - -MMIO_DH (GEN8_GT_IMR (2 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_GT_IER (2 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_GT_IIR (2 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_GT_ISR (2 ),D_BDW_PLUS ); - -MMIO_DH (GEN8_GT_IMR (3 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_GT_IER (3 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_GT_IIR (3 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_GT_ISR (3 ),D_BDW_PLUS ); - -MMIO_DH (GEN8_DE_PIPE_IMR (PIPE_A ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_DE_PIPE_IER (PIPE_A ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_DE_PIPE_IIR (PIPE_A ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_DE_PIPE_ISR (PIPE_A ),D_BDW_PLUS ); - -MMIO_DH (GEN8_DE_PIPE_IMR (PIPE_B ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_DE_PIPE_IER (PIPE_B ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_DE_PIPE_IIR (PIPE_B ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_DE_PIPE_ISR (PIPE_B ),D_BDW_PLUS ); - -MMIO_DH (GEN8_DE_PIPE_IMR (PIPE_C ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_DE_PIPE_IER (PIPE_C ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_DE_PIPE_IIR (PIPE_C ),D_BDW_PLUS ,NULL , - intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_DE_PIPE_ISR (PIPE_C ),D_BDW_PLUS ); - -MMIO_DH (GEN8_DE_PORT_IMR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_DE_PORT_IER ,D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_DE_PORT_IIR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_DE_PORT_ISR ,D_BDW_PLUS ); - -MMIO_DH (GEN8_DE_MISC_IMR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_DE_MISC_IER ,D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_DE_MISC_IIR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_DE_MISC_ISR ,D_BDW_PLUS ); - -MMIO_DH (GEN8_PCU_IMR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); -MMIO_DH (GEN8_PCU_IER ,D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); -MMIO_DH (GEN8_PCU_IIR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); -MMIO_D (GEN8_PCU_ISR ,D_BDW_PLUS ); - -MMIO_DH (GEN8_MASTER_IRQ ,D_BDW_PLUS ,NULL , - intel_vgpu_reg_master_irq_handler); - -MMIO_RING_DFH (RING_ACTHD_UDW ,D_BDW_PLUS ,0 , - mmio_read_from_hw,NULL ); +MMIO_H (GEN8_GT_IMR (0 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_GT_IER (0 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_GT_IIR (0 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_GT_IMR (1 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_GT_IER (1 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_GT_IIR (1 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_GT_IMR (2 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_GT_IER (2 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_GT_IIR (2 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_GT_IMR (3 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_GT_IER (3 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_GT_IIR (3 ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_DE_PIPE_IMR (PIPE_A ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_DE_PIPE_IER (PIPE_A ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_DE_PIPE_IIR (PIPE_A ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_DE_PIPE_IMR (PIPE_B ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_DE_PIPE_IER (PIPE_B ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_DE_PIPE_IIR (PIPE_B ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_DE_PIPE_IMR (PIPE_C ),D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_DE_PIPE_IER (PIPE_C ),D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_DE_PIPE_IIR (PIPE_C ),D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_DE_PORT_IMR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_DE_PORT_IER ,D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_DE_PORT_IIR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_DE_MISC_IMR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_DE_MISC_IER ,D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_DE_MISC_IIR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_PCU_IMR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_imr_handler); +MMIO_H (GEN8_PCU_IER ,D_BDW_PLUS ,NULL , intel_vgpu_reg_ier_handler); +MMIO_H (GEN8_PCU_IIR ,D_BDW_PLUS ,NULL , intel_vgpu_reg_iir_handler); +MMIO_H (GEN8_MASTER_IRQ ,D_BDW_PLUS ,NULL , intel_vgpu_reg_master_irq_handler); +MMIO_RING_H (RING_ACTHD_UDW ,D_BDW_PLUS , mmio_read_from_hw,NULL );#define RING_REG (base) _MMIO((base) + 0xd0) -MMIO_RING_F (RING_REG ,4 ,F_RO ,0 , - ~_MASKED_BIT_ENABLE (RESET_CTL_REQUEST_RESET ),D_BDW_PLUS ,NULL , - ring_reset_ctl_write); +MMIO_RING_F (RING_REG ,4 ,D_BDW_PLUS ,NULL , ring_reset_ctl_write);#undef RING_REG#define RING_REG (base) _MMIO((base) + 0x230) -MMIO_RING_DFH (RING_REG ,D_BDW_PLUS ,0 ,NULL , elsp_mmio_write); -#undef RING_REG - -#define RING_REG (base) _MMIO((base) + 0x234) -MMIO_RING_F (RING_REG ,8 ,F_RO ,0 , ~0 ,D_BDW_PLUS , -NULL ,NULL ); -#undef RING_REG - -#define RING_REG (base) _MMIO((base) + 0x244) -MMIO_RING_DFH (RING_REG ,D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -#undef RING_REG - -#define RING_REG (base) _MMIO((base) + 0x370) -MMIO_RING_F (RING_REG ,48 ,F_RO ,0 , ~0 ,D_BDW_PLUS ,NULL ,NULL ); +MMIO_RING_H (RING_REG ,D_BDW_PLUS ,NULL , elsp_mmio_write);#undef RING_REG -#define RING_REG (base) _MMIO((base) + 0x3a0) -MMIO_RING_DFH (RING_REG ,D_BDW_PLUS ,F_MODE_MASK ,NULL ,NULL ); -#undef RING_REG - -MMIO_D (PIPEMISC (PIPE_A ),D_BDW_PLUS ); -MMIO_D (PIPEMISC (PIPE_B ),D_BDW_PLUS ); -MMIO_D (PIPEMISC (PIPE_C ),D_BDW_PLUS ); -MMIO_D (_MMIO (0x1c1d0 ),D_BDW_PLUS ); -MMIO_D (GEN6_MBCUNIT_SNPCR ,D_BDW_PLUS ); -MMIO_D (GEN7_MISCCPCTL ,D_BDW_PLUS ); -MMIO_D (_MMIO (0x1c054 ),D_BDW_PLUS ); - -MMIO_DH (GEN6_PCODE_MAILBOX ,D_BDW_PLUS ,NULL , mailbox_write); - -MMIO_D (GEN8_PRIVATE_PAT_LO ,D_BDW_PLUS & ~D_BXT ); -MMIO_D (GEN8_PRIVATE_PAT_HI ,D_BDW_PLUS ); - -MMIO_D (GAMTARBMODE ,D_BDW_PLUS ); - -#define RING_REG (base) _MMIO((base) + 0x270) -MMIO_RING_F (RING_REG ,32 ,F_CMD_ACCESS ,0 ,0 ,D_BDW_PLUS ,NULL ,NULL ); -#undef RING_REG - -MMIO_RING_GM (RING_HWS_PGA ,D_BDW_PLUS ,NULL , hws_pga_write); - -MMIO_DFH (HDC_CHICKEN0 ,D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_D (CHICKEN_PIPESL_1 (PIPE_A ),D_BDW_PLUS ); -MMIO_D (CHICKEN_PIPESL_1 (PIPE_B ),D_BDW_PLUS ); -MMIO_D (CHICKEN_PIPESL_1 (PIPE_C ),D_BDW_PLUS ); - -MMIO_D (WM_MISC ,D_BDW ); -MMIO_D (_MMIO (_SRD_CTL_EDP),D_BDW ); - -MMIO_D (_MMIO (0x6671c ),D_BDW_PLUS ); -MMIO_D (_MMIO (0x66c00 ),D_BDW_PLUS ); -MMIO_D (_MMIO (0x66c04 ),D_BDW_PLUS ); - -MMIO_D (HSW_GTT_CACHE_EN ,D_BDW_PLUS ); - -MMIO_D (GEN8_EU_DISABLE0 ,D_BDW_PLUS ); -MMIO_D (GEN8_EU_DISABLE1 ,D_BDW_PLUS ); -MMIO_D (GEN8_EU_DISABLE2 ,D_BDW_PLUS ); - -MMIO_D (_MMIO (0xfdc ),D_BDW_PLUS ); -MMIO_DFH (GEN8_ROW_CHICKEN ,D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_DFH (GEN7_ROW_CHICKEN2 ,D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_DFH (GEN8_UCGCTL6 ,D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DFH (_MMIO (0xb1f0 ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xb1c0 ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GEN8_L3SQCREG4 ,D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xb100 ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xb10c ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_D (_MMIO (0xb110 ),D_BDW ); -MMIO_D (GEN9_SCRATCH_LNCF1 ,D_BDW_PLUS ); - -MMIO_F (_MMIO (0x24d0 ),48 ,F_CMD_ACCESS |F_CMD_WRITE_PATCH ,0 ,0 , -D_BDW_PLUS ,NULL , force_nonpriv_write); - -MMIO_D (_MMIO (0x44484 ),D_BDW_PLUS ); -MMIO_D (_MMIO (0x4448c ),D_BDW_PLUS ); - -MMIO_DFH (_MMIO (0x83a4 ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_D (GEN8_L3_LRA_1_GPGPU ,D_BDW_PLUS ); - -MMIO_DFH (_MMIO (0x8430 ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_D (_MMIO (0x110000 ),D_BDW_PLUS ); +MMIO_H (GEN6_PCODE_MAILBOX ,D_BDW_PLUS ,NULL , mailbox_write); +MMIO_RING_H (RING_HWS_PGA ,D_BDW_PLUS ,NULL , hws_pga_write); +MMIO_F (_MMIO (0x24d0 ),48 ,D_BDW_PLUS ,NULL , force_nonpriv_write); -MMIO_D (_MMIO (0x48400 ),D_BDW_PLUS ); - -MMIO_D (_MMIO (0x6e570 ),D_BDW_PLUS ); -MMIO_D (_MMIO (0x65f10 ),D_BDW_PLUS ); - -MMIO_DFH (_MMIO (0xe194 ),D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe188 ),D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (HALF_SLICE_CHICKEN2 ,D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x2580 ),D_BDW_PLUS ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DFH (_MMIO (0x2248 ),D_BDW ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DFH (_MMIO (0xe220 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe230 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe240 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe260 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe270 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe280 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe2a0 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe2b0 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0xe2c0 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x21f0 ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL );return 0 ; } -static int init_skl_mmio_info (struct intel_gvt *gvt) +static int init_skl_mmio_handlers (struct intel_gvt *gvt) {struct drm_i915_private *dev_priv = gvt->gt->i915;int ret; -MMIO_DH (FORCEWAKE_RENDER_GEN9 ,D_SKL_PLUS ,NULL , mul_force_wake_write); -MMIO_DH (FORCEWAKE_ACK_RENDER_GEN9 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (FORCEWAKE_GT_GEN9 ,D_SKL_PLUS ,NULL , mul_force_wake_write); -MMIO_DH (FORCEWAKE_ACK_GT_GEN9 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (FORCEWAKE_MEDIA_GEN9 ,D_SKL_PLUS ,NULL , mul_force_wake_write); -MMIO_DH (FORCEWAKE_ACK_MEDIA_GEN9 ,D_SKL_PLUS ,NULL ,NULL ); - -MMIO_F (DP_AUX_CH_CTL (AUX_CH_B ),6 *4 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL , - dp_aux_ch_ctl_mmio_write); -MMIO_F (DP_AUX_CH_CTL (AUX_CH_C ),6 *4 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL , - dp_aux_ch_ctl_mmio_write); -MMIO_F (DP_AUX_CH_CTL (AUX_CH_D ),6 *4 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL , - dp_aux_ch_ctl_mmio_write); - -MMIO_D (HSW_PWR_WELL_CTL1 ,D_SKL_PLUS ); -MMIO_DH (HSW_PWR_WELL_CTL2 ,D_SKL_PLUS ,NULL , skl_power_well_ctl_write); - -MMIO_DH (DBUF_CTL_S (0 ),D_SKL_PLUS ,NULL , gen9_dbuf_ctl_mmio_write); - -MMIO_D (GEN9_PG_ENABLE ,D_SKL_PLUS ); -MMIO_D (GEN9_MEDIA_PG_IDLE_HYSTERESIS ,D_SKL_PLUS ); -MMIO_D (GEN9_RENDER_PG_IDLE_HYSTERESIS ,D_SKL_PLUS ); -MMIO_DFH (GEN9_GAMT_ECO_REG_RW_IA ,D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (MMCD_MISC_CTRL ,D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DH (CHICKEN_PAR1_1 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_D (DC_STATE_EN ,D_SKL_PLUS ); -MMIO_D (DC_STATE_DEBUG ,D_SKL_PLUS ); -MMIO_D (CDCLK_CTL ,D_SKL_PLUS ); -MMIO_DH (LCPLL1_CTL ,D_SKL_PLUS ,NULL , skl_lcpll_write); -MMIO_DH (LCPLL2_CTL ,D_SKL_PLUS ,NULL , skl_lcpll_write); -MMIO_D (_MMIO (_DPLL1_CFGCR1),D_SKL_PLUS ); -MMIO_D (_MMIO (_DPLL2_CFGCR1),D_SKL_PLUS ); -MMIO_D (_MMIO (_DPLL3_CFGCR1),D_SKL_PLUS ); -MMIO_D (_MMIO (_DPLL1_CFGCR2),D_SKL_PLUS ); -MMIO_D (_MMIO (_DPLL2_CFGCR2),D_SKL_PLUS ); -MMIO_D (_MMIO (_DPLL3_CFGCR2),D_SKL_PLUS ); -MMIO_D (DPLL_CTRL1 ,D_SKL_PLUS ); -MMIO_D (DPLL_CTRL2 ,D_SKL_PLUS ); -MMIO_DH (DPLL_STATUS ,D_SKL_PLUS , dpll_status_read,NULL ); - -MMIO_DH (SKL_PS_WIN_POS (PIPE_A ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_POS (PIPE_A ,1 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_POS (PIPE_B ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_POS (PIPE_B ,1 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_POS (PIPE_C ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_POS (PIPE_C ,1 ),D_SKL_PLUS ,NULL , pf_write); - -MMIO_DH (SKL_PS_WIN_SZ (PIPE_A ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_SZ (PIPE_A ,1 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_SZ (PIPE_B ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_SZ (PIPE_B ,1 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_SZ (PIPE_C ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_WIN_SZ (PIPE_C ,1 ),D_SKL_PLUS ,NULL , pf_write); - -MMIO_DH (SKL_PS_CTRL (PIPE_A ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_CTRL (PIPE_A ,1 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_CTRL (PIPE_B ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_CTRL (PIPE_B ,1 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_CTRL (PIPE_C ,0 ),D_SKL_PLUS ,NULL , pf_write); -MMIO_DH (SKL_PS_CTRL (PIPE_C ,1 ),D_SKL_PLUS ,NULL , pf_write); - -MMIO_DH (PLANE_BUF_CFG (PIPE_A ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_A ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_A ,2 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_A ,3 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_BUF_CFG (PIPE_B ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_B ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_B ,2 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_B ,3 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_BUF_CFG (PIPE_C ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_C ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_C ,2 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_BUF_CFG (PIPE_C ,3 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (CUR_BUF_CFG (PIPE_A ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (CUR_BUF_CFG (PIPE_B ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (CUR_BUF_CFG (PIPE_C ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_F (PLANE_WM (PIPE_A ,0 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (PLANE_WM (PIPE_A ,1 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (PLANE_WM (PIPE_A ,2 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); - -MMIO_F (PLANE_WM (PIPE_B ,0 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (PLANE_WM (PIPE_B ,1 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (PLANE_WM (PIPE_B ,2 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); - -MMIO_F (PLANE_WM (PIPE_C ,0 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (PLANE_WM (PIPE_C ,1 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (PLANE_WM (PIPE_C ,2 ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); - -MMIO_F (CUR_WM (PIPE_A ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (CUR_WM (PIPE_B ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); -MMIO_F (CUR_WM (PIPE_C ,0 ),4 *8 ,0 ,0 ,0 ,D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_WM_TRANS (PIPE_A ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_WM_TRANS (PIPE_A ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_WM_TRANS (PIPE_A ,2 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_WM_TRANS (PIPE_B ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_WM_TRANS (PIPE_B ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_WM_TRANS (PIPE_B ,2 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_WM_TRANS (PIPE_C ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_WM_TRANS (PIPE_C ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_WM_TRANS (PIPE_C ,2 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (CUR_WM_TRANS (PIPE_A ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (CUR_WM_TRANS (PIPE_B ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (CUR_WM_TRANS (PIPE_C ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_A ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_A ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_A ,2 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_A ,3 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_B ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_B ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_B ,2 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_B ,3 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_C ,0 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_C ,1 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_C ,2 ),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (PLANE_NV12_BUF_CFG (PIPE_C ,3 ),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (_MMIO (_REG_701C0 (PIPE_A ,1 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_A ,2 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_A ,3 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_A ,4 )),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (_MMIO (_REG_701C0 (PIPE_B ,1 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_B ,2 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_B ,3 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_B ,4 )),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (_MMIO (_REG_701C0 (PIPE_C ,1 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_C ,2 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_C ,3 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C0 (PIPE_C ,4 )),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (_MMIO (_REG_701C4 (PIPE_A ,1 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_A ,2 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_A ,3 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_A ,4 )),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (_MMIO (_REG_701C4 (PIPE_B ,1 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_B ,2 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_B ,3 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_B ,4 )),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_DH (_MMIO (_REG_701C4 (PIPE_C ,1 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_C ,2 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_C ,3 )),D_SKL_PLUS ,NULL ,NULL ); -MMIO_DH (_MMIO (_REG_701C4 (PIPE_C ,4 )),D_SKL_PLUS ,NULL ,NULL ); - -MMIO_D (_MMIO (_PLANE_CTL_3_A),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_CTL_3_B),D_SKL_PLUS ); -MMIO_D (_MMIO (0x72380 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x7239c ),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_SURF_3_A),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_SURF_3_B),D_SKL_PLUS ); - -MMIO_D (DMC_SSP_BASE ,D_SKL_PLUS ); -MMIO_D (DMC_HTP_SKL ,D_SKL_PLUS ); -MMIO_D (DMC_LAST_WRITE ,D_SKL_PLUS ); - -MMIO_DFH (BDW_SCRATCH1 ,D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_D (SKL_DFSM ,D_SKL_PLUS ); -MMIO_D (DISPIO_CR_TX_BMU_CR0 ,D_SKL_PLUS ); - -MMIO_F (GEN9_GFX_MOCS (0 ),0x7f8 ,F_CMD_ACCESS ,0 ,0 ,D_SKL_PLUS , -NULL ,NULL ); -MMIO_F (GEN7_L3CNTLREG2 ,0x80 ,F_CMD_ACCESS ,0 ,0 ,D_SKL_PLUS , -NULL ,NULL ); - -MMIO_D (RPM_CONFIG0 ,D_SKL_PLUS ); -MMIO_D (_MMIO (0xd08 ),D_SKL_PLUS ); -MMIO_D (RC6_LOCATION ,D_SKL_PLUS ); -MMIO_DFH (GEN7_FF_SLICE_CS_CHICKEN1 ,D_SKL_PLUS , -F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GEN9_CS_DEBUG_MODE1 ,D_SKL_PLUS ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); - -/* TRTT */ -MMIO_DFH (TRVATTL3PTRDW (0 ),D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (TRVATTL3PTRDW (1 ),D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (TRVATTL3PTRDW (2 ),D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (TRVATTL3PTRDW (3 ),D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (TRVADR ,D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (TRTTE ,D_SKL_PLUS ,F_CMD_ACCESS |F_PM_SAVE , -NULL , gen9_trtte_write); -MMIO_DFH (_MMIO (0x4dfc ),D_SKL_PLUS ,F_PM_SAVE , -NULL , gen9_trtt_chicken_write); - -MMIO_D (_MMIO (0x46430 ),D_SKL_PLUS ); - -MMIO_D (_MMIO (0x46520 ),D_SKL_PLUS ); - -MMIO_D (_MMIO (0xc403c ),D_SKL_PLUS ); -MMIO_DFH (GEN8_GARBCNTL ,D_SKL_PLUS ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DH (DMA_CTRL ,D_SKL_PLUS ,NULL , dma_ctrl_write); - -MMIO_D (_MMIO (0x65900 ),D_SKL_PLUS ); -MMIO_D (GEN6_STOLEN_RESERVED ,D_SKL_PLUS ); -MMIO_D (_MMIO (0x4068 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x67054 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x6e560 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x6e554 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x2b20 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x65f00 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x65f08 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x320f0 ),D_SKL_PLUS ); - -MMIO_D (_MMIO (0x70034 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x71034 ),D_SKL_PLUS ); -MMIO_D (_MMIO (0x72034 ),D_SKL_PLUS ); - -MMIO_D (_MMIO (_PLANE_KEYVAL_1 (PIPE_A )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYVAL_1 (PIPE_B )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYVAL_1 (PIPE_C )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYMAX_1 (PIPE_A )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYMAX_1 (PIPE_B )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYMAX_1 (PIPE_C )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYMSK_1 (PIPE_A )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYMSK_1 (PIPE_B )),D_SKL_PLUS ); -MMIO_D (_MMIO (_PLANE_KEYMSK_1 (PIPE_C )),D_SKL_PLUS ); - -MMIO_D (_MMIO (0x44500 ),D_SKL_PLUS ); +MMIO_H (FORCEWAKE_RENDER_GEN9 ,D_SKL_PLUS ,NULL , mul_force_wake_write); +MMIO_H (FORCEWAKE_GT_GEN9 ,D_SKL_PLUS ,NULL , mul_force_wake_write); +MMIO_H (FORCEWAKE_MEDIA_GEN9 ,D_SKL_PLUS ,NULL , mul_force_wake_write); +MMIO_F (DP_AUX_CH_CTL (AUX_CH_B ),6 *4 ,D_SKL_PLUS ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_F (DP_AUX_CH_CTL (AUX_CH_C ),6 *4 ,D_SKL_PLUS ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_F (DP_AUX_CH_CTL (AUX_CH_D ),6 *4 ,D_SKL_PLUS ,NULL , dp_aux_ch_ctl_mmio_write); +MMIO_H (HSW_PWR_WELL_CTL2 ,D_SKL_PLUS ,NULL , skl_power_well_ctl_write); +MMIO_H (DBUF_CTL_S (0 ),D_SKL_PLUS ,NULL , gen9_dbuf_ctl_mmio_write); +MMIO_H (LCPLL1_CTL ,D_SKL_PLUS ,NULL , skl_lcpll_write); +MMIO_H (LCPLL2_CTL ,D_SKL_PLUS ,NULL , skl_lcpll_write); +MMIO_H (DPLL_STATUS ,D_SKL_PLUS , dpll_status_read,NULL ); +MMIO_H (SKL_PS_WIN_POS (PIPE_A ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_POS (PIPE_A ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_POS (PIPE_B ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_POS (PIPE_B ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_POS (PIPE_C ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_POS (PIPE_C ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_SZ (PIPE_A ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_SZ (PIPE_A ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_SZ (PIPE_B ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_SZ (PIPE_B ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_SZ (PIPE_C ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_WIN_SZ (PIPE_C ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_CTRL (PIPE_A ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_CTRL (PIPE_A ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_CTRL (PIPE_B ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_CTRL (PIPE_B ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_CTRL (PIPE_C ,0 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (SKL_PS_CTRL (PIPE_C ,1 ),D_SKL_PLUS ,NULL , pf_write); +MMIO_H (TRTTE ,D_SKL_PLUS ,NULL , gen9_trtte_write); +MMIO_H (_MMIO (0x4dfc ),D_SKL_PLUS ,NULL , gen9_trtt_chicken_write); +MMIO_H (DMA_CTRL ,D_SKL_PLUS ,NULL , dma_ctrl_write); +#define CSFE_CHICKEN1_REG (base) _MMIO((base) + 0xD4) -MMIO_RING_DFH (CSFE_CHICKEN1_REG ,D_SKL_PLUS ,F_MODE_MASK |F_CMD_ACCESS , -NULL , csfe_chicken1_mmio_write); +MMIO_RING_H (CSFE_CHICKEN1_REG ,D_SKL_PLUS ,NULL , csfe_chicken1_mmio_write);#undef CSFE_CHICKEN1_REG -MMIO_DFH (GEN8_HDC_CHICKEN1 ,D_SKL_PLUS ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); -MMIO_DFH (GEN9_WM_CHICKEN3 ,D_SKL_PLUS ,F_MODE_MASK |F_CMD_ACCESS , -NULL ,NULL ); - -MMIO_DFH (GAMT_CHKN_BIT_REG ,D_KBL |D_CFL ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_D (GEN9_CTX_PREEMPT_REG ,D_SKL_PLUS & ~D_BXT ); -MMIO_DFH (_MMIO (0xe4cc ),D_BDW_PLUS ,F_CMD_ACCESS ,NULL ,NULL );return 0 ; } -static int init_bxt_mmio_info (struct intel_gvt *gvt) +static int init_bxt_mmio_handlers (struct intel_gvt *gvt) { -struct drm_i915_private *dev_priv = gvt->gt->i915;int ret; -MMIO_F (_MMIO (0x80000 ),0x3000 ,0 ,0 ,0 ,D_BXT ,NULL ,NULL ); - -MMIO_D (GEN7_SAMPLER_INSTDONE ,D_BXT ); -MMIO_D (GEN7_ROW_INSTDONE ,D_BXT ); -MMIO_D (GEN8_FAULT_TLB_DATA0 ,D_BXT ); -MMIO_D (GEN8_FAULT_TLB_DATA1 ,D_BXT ); -MMIO_D (ERROR_GEN6 ,D_BXT ); -MMIO_D (DONE_REG ,D_BXT ); -MMIO_D (EIR ,D_BXT ); -MMIO_D (PGTBL_ER ,D_BXT ); -MMIO_D (_MMIO (0x4194 ),D_BXT ); -MMIO_D (_MMIO (0x4294 ),D_BXT ); -MMIO_D (_MMIO (0x4494 ),D_BXT ); - -MMIO_RING_D (RING_PSMI_CTL ,D_BXT ); -MMIO_RING_D (RING_DMA_FADD ,D_BXT ); -MMIO_RING_D (RING_DMA_FADD_UDW ,D_BXT ); -MMIO_RING_D (RING_IPEHR ,D_BXT ); -MMIO_RING_D (RING_INSTPS ,D_BXT ); -MMIO_RING_D (RING_BBADDR_UDW ,D_BXT ); -MMIO_RING_D (RING_BBSTATE ,D_BXT ); -MMIO_RING_D (RING_IPEIR ,D_BXT ); - -MMIO_F (SOFT_SCRATCH (0 ),16 *4 ,0 ,0 ,0 ,D_BXT ,NULL ,NULL ); - -MMIO_DH (BXT_P_CR_GT_DISP_PWRON ,D_BXT ,NULL , bxt_gt_disp_pwron_write); -MMIO_D (BXT_RP_STATE_CAP ,D_BXT ); -MMIO_DH (BXT_PHY_CTL_FAMILY (DPIO_PHY0 ),D_BXT , -NULL , bxt_phy_ctl_family_write); -MMIO_DH (BXT_PHY_CTL_FAMILY (DPIO_PHY1 ),D_BXT , -NULL , bxt_phy_ctl_family_write); -MMIO_D (BXT_PHY_CTL (PORT_A ),D_BXT ); -MMIO_D (BXT_PHY_CTL (PORT_B ),D_BXT ); -MMIO_D (BXT_PHY_CTL (PORT_C ),D_BXT ); -MMIO_DH (BXT_PORT_PLL_ENABLE (PORT_A ),D_BXT , -NULL , bxt_port_pll_enable_write); -MMIO_DH (BXT_PORT_PLL_ENABLE (PORT_B ),D_BXT , -NULL , bxt_port_pll_enable_write); -MMIO_DH (BXT_PORT_PLL_ENABLE (PORT_C ),D_BXT ,NULL , - bxt_port_pll_enable_write); - -MMIO_D (BXT_PORT_CL1CM_DW0 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW9 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW10 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW28 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW30 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_CL2CM_DW6 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_REF_DW3 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_REF_DW6 (DPIO_PHY0 ),D_BXT ); -MMIO_D (BXT_PORT_REF_DW8 (DPIO_PHY0 ),D_BXT ); - -MMIO_D (BXT_PORT_CL1CM_DW0 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW9 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW10 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW28 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_CL1CM_DW30 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_CL2CM_DW6 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_REF_DW3 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_REF_DW6 (DPIO_PHY1 ),D_BXT ); -MMIO_D (BXT_PORT_REF_DW8 (DPIO_PHY1 ),D_BXT ); - -MMIO_D (BXT_PORT_PLL_EBB_0 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PLL_EBB_4 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW10_LN01 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW10_GRP (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW12_LN01 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW12_LN23 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_DH (BXT_PORT_PCS_DW12_GRP (DPIO_PHY0 ,DPIO_CH0 ),D_BXT , -NULL , bxt_pcs_dw12_grp_write); -MMIO_D (BXT_PORT_TX_DW2_LN0 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW2_GRP (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_DH (BXT_PORT_TX_DW3_LN0 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT , - bxt_port_tx_dw3_read,NULL ); -MMIO_D (BXT_PORT_TX_DW3_GRP (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW4_LN0 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW4_GRP (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH0 ,0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH0 ,1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH0 ,2 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH0 ,3 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,0 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,1 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,2 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,3 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,6 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,8 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,9 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH0 ,10 ),D_BXT ); - -MMIO_D (BXT_PORT_PLL_EBB_0 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_PLL_EBB_4 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW10_LN01 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW10_GRP (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW12_LN01 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW12_LN23 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_DH (BXT_PORT_PCS_DW12_GRP (DPIO_PHY0 ,DPIO_CH1 ),D_BXT , -NULL , bxt_pcs_dw12_grp_write); -MMIO_D (BXT_PORT_TX_DW2_LN0 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW2_GRP (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_DH (BXT_PORT_TX_DW3_LN0 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT , - bxt_port_tx_dw3_read,NULL ); -MMIO_D (BXT_PORT_TX_DW3_GRP (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW4_LN0 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW4_GRP (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH1 ,0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH1 ,1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH1 ,2 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY0 ,DPIO_CH1 ,3 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,0 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,1 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,2 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,3 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,6 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,8 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,9 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY0 ,DPIO_CH1 ,10 ),D_BXT ); - -MMIO_D (BXT_PORT_PLL_EBB_0 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PLL_EBB_4 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW10_LN01 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW10_GRP (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW12_LN01 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_PCS_DW12_LN23 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_DH (BXT_PORT_PCS_DW12_GRP (DPIO_PHY1 ,DPIO_CH0 ),D_BXT , -NULL , bxt_pcs_dw12_grp_write); -MMIO_D (BXT_PORT_TX_DW2_LN0 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW2_GRP (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_DH (BXT_PORT_TX_DW3_LN0 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT , - bxt_port_tx_dw3_read,NULL ); -MMIO_D (BXT_PORT_TX_DW3_GRP (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW4_LN0 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW4_GRP (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY1 ,DPIO_CH0 ,0 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY1 ,DPIO_CH0 ,1 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY1 ,DPIO_CH0 ,2 ),D_BXT ); -MMIO_D (BXT_PORT_TX_DW14_LN (DPIO_PHY1 ,DPIO_CH0 ,3 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,0 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,1 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,2 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,3 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,6 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,8 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,9 ),D_BXT ); -MMIO_D (BXT_PORT_PLL (DPIO_PHY1 ,DPIO_CH0 ,10 ),D_BXT ); - -MMIO_D (BXT_DE_PLL_CTL ,D_BXT ); -MMIO_DH (BXT_DE_PLL_ENABLE ,D_BXT ,NULL , bxt_de_pll_enable_write); -MMIO_D (BXT_DSI_PLL_CTL ,D_BXT ); -MMIO_D (BXT_DSI_PLL_ENABLE ,D_BXT ); - -MMIO_D (GEN9_CLKGATE_DIS_0 ,D_BXT ); -MMIO_D (GEN9_CLKGATE_DIS_4 ,D_BXT ); - -MMIO_D (HSW_TVIDEO_DIP_GCP (TRANSCODER_A ),D_BXT ); -MMIO_D (HSW_TVIDEO_DIP_GCP (TRANSCODER_B ),D_BXT ); -MMIO_D (HSW_TVIDEO_DIP_GCP (TRANSCODER_C ),D_BXT ); - -MMIO_D (RC6_CTX_BASE ,D_BXT ); - -MMIO_D (GEN8_PUSHBUS_CONTROL ,D_BXT ); -MMIO_D (GEN8_PUSHBUS_ENABLE ,D_BXT ); -MMIO_D (GEN8_PUSHBUS_SHIFT ,D_BXT ); -MMIO_D (GEN6_GFXPAUSE ,D_BXT ); -MMIO_DFH (GEN8_L3SQCREG1 ,D_BXT ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (GEN8_L3CNTLREG ,D_BXT ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_DFH (_MMIO (0x20D8 ),D_BXT ,F_CMD_ACCESS ,NULL ,NULL ); -MMIO_F (GEN8_RING_CS_GPR (RENDER_RING_BASE ,0 ),0x40 ,F_CMD_ACCESS , -0 ,0 ,D_BXT ,NULL ,NULL ); -MMIO_F (GEN8_RING_CS_GPR (GEN6_BSD_RING_BASE ,0 ),0x40 ,F_CMD_ACCESS , -0 ,0 ,D_BXT ,NULL ,NULL ); -MMIO_F (GEN8_RING_CS_GPR (BLT_RING_BASE ,0 ),0x40 ,F_CMD_ACCESS , -0 ,0 ,D_BXT ,NULL ,NULL ); -MMIO_F (GEN8_RING_CS_GPR (VEBOX_RING_BASE ,0 ),0x40 ,F_CMD_ACCESS , -0 ,0 ,D_BXT ,NULL ,NULL ); - -MMIO_DFH (GEN9_CTX_PREEMPT_REG ,D_BXT ,F_CMD_ACCESS ,NULL ,NULL ); - -MMIO_DH (GEN8_PRIVATE_PAT_LO ,D_BXT ,NULL , bxt_ppat_low_write); - -return 0 ; -} - -static const struct gvt_mmio_block *find_mmio_block (struct intel_gvt *gvt, +MMIO_H (BXT_P_CR_GT_DISP_PWRON ,D_BXT ,NULL , bxt_gt_disp_pwron_write); +MMIO_H (BXT_PHY_CTL_FAMILY (DPIO_PHY0 ),D_BXT ,NULL , bxt_phy_ctl_family_write); +MMIO_H (BXT_PHY_CTL_FAMILY (DPIO_PHY1 ),D_BXT ,NULL , bxt_phy_ctl_family_write); +MMIO_H (BXT_PORT_PLL_ENABLE (PORT_A ),D_BXT ,NULL , bxt_port_pll_enable_write); +MMIO_H (BXT_PORT_PLL_ENABLE (PORT_B ),D_BXT ,NULL , bxt_port_pll_enable_write); +MMIO_H (BXT_PORT_PLL_ENABLE (PORT_C ),D_BXT ,NULL , bxt_port_pll_enable_write); +MMIO_H (BXT_PORT_PCS_DW12_GRP (DPIO_PHY0 ,DPIO_CH0 ),D_BXT ,NULL , bxt_pcs_dw12_grp_write); +MMIO_H (BXT_PORT_TX_DW3_LN0 (DPIO_PHY0 ,DPIO_CH0 ),D_BXT , bxt_port_tx_dw3_read,NULL ); +MMIO_H (BXT_PORT_PCS_DW12_GRP (DPIO_PHY0 ,DPIO_CH1 ),D_BXT ,NULL , bxt_pcs_dw12_grp_write); +MMIO_H (BXT_PORT_TX_DW3_LN0 (DPIO_PHY0 ,DPIO_CH1 ),D_BXT , bxt_port_tx_dw3_read,NULL ); +MMIO_H (BXT_PORT_PCS_DW12_GRP (DPIO_PHY1 ,DPIO_CH0 ),D_BXT ,NULL , bxt_pcs_dw12_grp_write); +MMIO_H (BXT_PORT_TX_DW3_LN0 (DPIO_PHY1 ,DPIO_CH0 ),D_BXT , bxt_port_tx_dw3_read,NULL ); +MMIO_H (BXT_DE_PLL_ENABLE ,D_BXT ,NULL , bxt_de_pll_enable_write); +MMIO_H (GEN8_PRIVATE_PAT_LO ,D_BXT ,NULL , bxt_ppat_low_write); + +return 0 ; +} + +static struct intel_gvt_mmio_block *find_mmio_block (struct intel_gvt *gvt,unsigned int offset) { -unsigned long device =intel_gvt_get_device_type (gvt); -const struct gvt_mmio_block *block = gvt->mmio.mmio_block; +unsigned long device =intel_gvt_get_device_type (gvt->gt->i915); +struct intel_gvt_mmio_block *block = gvt->mmio.mmio_block;int num = gvt->mmio.num_mmio_block;int i;for (i =0 ; i < num; i++, block++) {if (!(device & block->device))continue ; -if (offset >=i915_mmio_reg_offset (block->offset) && - offset <i915_mmio_reg_offset (block->offset) + block->size) +if (offset >= block->offset && + offset < block->offset + block->size)return block; }return NULL ;@@ -3664,23 +2370,110 @@ void intel_gvt_clean_mmio_info(struct intel_gvt *gvt)hash_for_each_safe (gvt->mmio.mmio_info_table, i, tmp, e, node)kfree (e); +kfree (gvt->mmio.mmio_block); + gvt->mmio.mmio_block =NULL ; + gvt->mmio.num_mmio_block =0 ; +vfree (gvt->mmio.mmio_attribute); gvt->mmio.mmio_attribute =NULL ; } -/* Special MMIO blocks. registers in MMIO block ranges should not be command -* accessible (should have no F_CMD_ACCESS flag). -* otherwise, need to update cmd_reg_handler in cmd_parser.c -*/ -static const struct gvt_mmio_block mmio_blocks[] = { - {D_SKL_PLUS ,_MMIO (DMC_MMIO_START_RANGE ),0x3000 ,NULL ,NULL }, - {D_ALL ,_MMIO (MCHBAR_MIRROR_BASE_SNB ),0x40000 ,NULL ,NULL }, - {D_ALL ,_MMIO (VGT_PVINFO_PAGE ),VGT_PVINFO_SIZE , - pvinfo_mmio_read, pvinfo_mmio_write}, - {D_ALL ,LGC_PALETTE (PIPE_A ,0 ),1024 ,NULL ,NULL }, - {D_ALL ,LGC_PALETTE (PIPE_B ,0 ),1024 ,NULL ,NULL }, - {D_ALL ,LGC_PALETTE (PIPE_C ,0 ),1024 ,NULL ,NULL }, -}; +static int do_mmio (u32 offset,u16 flags,u32 size,u32 addr_mask, +u32 ro_mask,u32 device, +struct intel_gvt_mmio_table_iter *iter) +{ +struct intel_gvt *gvt = iter->data; +struct intel_gvt_mmio_info *info, *p; +u32 start, end, i; + +if (!intel_gvt_match_device (gvt, device)) +return 0 ; + +if (WARN_ON (!IS_ALIGNED (offset,4 ))) +return -EINVAL ; + + start = offset; + end = offset + size; + +for (i = start; i < end; i +=4 ) { + info =kzalloc (sizeof (*info),GFP_KERNEL ); +if (!info) +return -ENOMEM ; + + info->offset = i; + p =intel_gvt_find_mmio_info (gvt, info->offset); +if (p) { +WARN (1 ,"dup mmio definition offset %x\n" , + info->offset); +kfree (info); + +/* We return -EEXIST here to make GVT-g load fail. +* So duplicated MMIO can be found as soon as +* possible. +*/ +return -EEXIST ; + } + + info->ro_mask = ro_mask; + info->device = device; + info->read = intel_vgpu_default_mmio_read; + info->write = intel_vgpu_default_mmio_write; + gvt->mmio.mmio_attribute[info->offset /4 ] = flags; +INIT_HLIST_NODE (&info->node); +hash_add (gvt->mmio.mmio_info_table, &info->node, info->offset); + gvt->mmio.num_tracked_mmio++; + } +return 0 ; +} + +static int do_mmio_block (u32 offset,u32 size,u32 device, +struct intel_gvt_mmio_table_iter *iter) +{ +struct intel_gvt *gvt = iter->data; +struct intel_gvt_mmio_block *block = gvt->mmio.mmio_block; +void *ret; + + ret =krealloc (block, + (gvt->mmio.num_mmio_block +1 ) *sizeof (*block), +GFP_KERNEL ); +if (!ret) +return -ENOMEM ; + + gvt->mmio.mmio_block = block = ret; + + block += gvt->mmio.num_mmio_block; + + block->offset = offset; + block->size = size; + block->device = device; + + gvt->mmio.num_mmio_block++; + +return 0 ; +} + +static int init_mmio_info (struct intel_gvt *gvt) +{ +struct intel_gvt_mmio_table_iter iter; + + iter.i915 = gvt->gt->i915; + iter.data = gvt; + iter.do_mmio = do_mmio; + iter.do_mmio_block = do_mmio_block; + +return intel_gvt_iterate_mmio_table (&iter); +} + +static int init_mmio_block_handlers (struct intel_gvt *gvt) +{ +struct intel_gvt_mmio_block *block; + + block =find_mmio_block (gvt,VGT_PVINFO_PAGE ); + block->read = pvinfo_mmio_read; + block->write = pvinfo_mmio_write; + +return 0 ; +}/** * intel_gvt_setup_mmio_info - setup MMIO information table for GVT device @@ -3703,39 +2496,44 @@ int intel_gvt_setup_mmio_info(struct intel_gvt *gvt)if (!gvt->mmio.mmio_attribute)return -ENOMEM ; - ret =init_generic_mmio_info (gvt); + ret =init_mmio_info (gvt); +if (ret) + goto err; + + ret =init_mmio_block_handlers (gvt); +if (ret) + goto err; + + ret =init_generic_mmio_handlers (gvt);if (ret) goto err;if (IS_BROADWELL (i915)) { - ret =init_bdw_mmio_info (gvt); + ret =init_bdw_mmio_handlers (gvt);if (ret) goto err; }else if (IS_SKYLAKE (i915) || -IS_KABYLAKE (i915) || -IS_COFFEELAKE (i915) || -IS_COMETLAKE (i915)) { - ret =init_bdw_mmio_info (gvt); +IS_KABYLAKE (i915) || +IS_COFFEELAKE (i915) || +IS_COMETLAKE (i915)) { + ret =init_bdw_mmio_handlers (gvt);if (ret) goto err; - ret =init_skl_mmio_info (gvt); + ret =init_skl_mmio_handlers (gvt);if (ret) goto err; }else if (IS_BROXTON (i915)) { - ret =init_bdw_mmio_info (gvt); + ret =init_bdw_mmio_handlers (gvt);if (ret) goto err; - ret =init_skl_mmio_info (gvt); + ret =init_skl_mmio_handlers (gvt);if (ret) goto err; - ret =init_bxt_mmio_info (gvt); + ret =init_bxt_mmio_handlers (gvt);if (ret) goto err; } - gvt->mmio.mmio_block = mmio_blocks; - gvt->mmio.num_mmio_block =ARRAY_SIZE (mmio_blocks); -return 0 ; err:intel_gvt_clean_mmio_info (gvt);@@ -3755,7 +2553,7 @@ int intel_gvt_for_each_tracked_mmio(struct intel_gvt *gvt,int (*handler)(struct intel_gvt *gvt,u32 offset,void *data), void *data) { - const struct gvt_mmio_block *block = gvt->mmio.mmio_block; + const struct intel_gvt_mmio_block *block = gvt->mmio.mmio_block;struct intel_gvt_mmio_info *e;int i, j, ret;@@ -3767,13 +2565,11 @@ int intel_gvt_for_each_tracked_mmio(struct intel_gvt *gvt,for (i =0 ; i < gvt->mmio.num_mmio_block; i++, block++) {/* pvinfo data doesn't come from hw mmio */ -if (i915_mmio_reg_offset (block->offset) ==VGT_PVINFO_PAGE ) +if (block->offset ==VGT_PVINFO_PAGE )continue ;for (j =0 ; j < block->size; j +=4 ) { - ret =handler (gvt, -i915_mmio_reg_offset (block->offset) + j, - data); + ret =handler (gvt, block->offset + j, data);if (ret)return ret; }@@ -3873,7 +2669,7 @@ int intel_vgpu_mmio_reg_rw(struct intel_vgpu *vgpu, unsigned int offset,struct drm_i915_private *i915 = vgpu->gvt->gt->i915;struct intel_gvt *gvt = vgpu->gvt;struct intel_gvt_mmio_info *mmio_info; -const struct gvt_mmio_block *mmio_block; +struct intel_gvt_mmio_block *mmio_block;gvt_mmio_func func;int ret;drivers/gpu/drm/i915/gvt/mmio.h +0
-2@@ -71,8 +71,6 @@ struct intel_gvt_mmio_info {const struct intel_engine_cs *intel_gvt_render_mmio_to_engine (struct intel_gvt *gvt,unsigned int reg); -unsigned long intel_gvt_get_device_type (struct intel_gvt *gvt); -bool intel_gvt_match_device (struct intel_gvt *gvt,unsigned long device);int intel_gvt_setup_mmio_info (struct intel_gvt *gvt);void intel_gvt_clean_mmio_info (struct intel_gvt *gvt);drivers/gpu/drm/i915/gvt/mmio_table.c new file +1386
-0@@ -0,0 +1,1386 @@ +/* +* Copyright(c) 2021 Intel Corporation. All rights reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +* SOFTWARE. +* +*/ + +#include "i915_drv.h" +#include "i915_pvinfo.h" +#include "gvt.h" + +/** +* intel_gvt_get_init_device_info - Fill a GVT device info +* @i915: drm i915 private data +* @info: GVT device info +* +* This function will be called during the initialization of a GVT device. +*/ +void intel_gvt_init_device_info (struct drm_i915_private *i915,struct intel_gvt_device_info *info) +{ +struct pci_dev *pdev =to_pci_dev (i915->drm.dev); + + info->max_support_vgpus =8 ; + info->cfg_space_size =PCI_CFG_SPACE_EXP_SIZE ; + info->mmio_size =2 *1024 *1024 ; + info->mmio_bar =0 ; + info->gtt_start_offset =8 *1024 *1024 ; + info->gtt_entry_size =8 ; + info->gtt_entry_size_shift =3 ; + info->gmadr_bytes_in_cmd =8 ; + info->max_surface_size =36 *1024 *1024 ; + info->msi_cap_offset = pdev->msi_cap; +} + +/** +* intel_gvt_get_device_type - return the device flag of a GVT device +* @i915: drm i915 private data +* +* This function will return the device flag of a GVT device. +*/ +unsigned long intel_gvt_get_device_type (struct drm_i915_private *i915) +{ +if (IS_BROADWELL (i915)) +return D_BDW ; +else if (IS_SKYLAKE (i915)) +return D_SKL ; +else if (IS_KABYLAKE (i915)) +return D_KBL ; +else if (IS_BROXTON (i915)) +return D_BXT ; +else if (IS_COFFEELAKE (i915) ||IS_COMETLAKE (i915)) +return D_CFL ; + +return 0 ; +} + +#define MMIO_F (reg, s, f, am, rm, d) do { \ + if (intel_gvt_get_device_type(iter->i915) & (d)) { \ + ret = iter->do_mmio(i915_mmio_reg_offset(reg), \ + f, s, am, rm, d, iter); \ + if (ret) \ + return ret; \ + } \ +} while (0) + +#define MMIO_D (reg, d) \ + MMIO_F(reg, 4, 0, 0, 0, d) + +#define MMIO_DF (reg, d, f) \ + MMIO_F(reg, 4, f, 0, 0, d) + +#define MMIO_GM_RDR (reg, d) \ + MMIO_F(reg, 4, F_GMADR | F_CMD_ACCESS, 0xFFFFF000, 0, d) + +#define MMIO_RO (reg, d, f, rm) \ + MMIO_F(reg, 4, F_RO | f, 0, rm, d) + +#define MMIO_RING_F (prefix, s, f, am, rm, d) do { \ + MMIO_F(prefix(RENDER_RING_BASE), s, f, am, rm, d); \ + MMIO_F(prefix(BLT_RING_BASE), s, f, am, rm, d); \ + MMIO_F(prefix(GEN6_BSD_RING_BASE), s, f, am, rm, d); \ + MMIO_F(prefix(VEBOX_RING_BASE), s, f, am, rm, d); \ + if (HAS_ENGINE(to_gt(iter->i915), VCS1)) \ + MMIO_F(prefix(GEN8_BSD2_RING_BASE), s, f, am, rm, d); \ +} while (0) + +#define MMIO_RING_D (prefix, d) \ + MMIO_RING_F(prefix, 4, 0, 0, 0, d) + +#define MMIO_RING_DF (prefix, d, f) \ + MMIO_RING_F(prefix, 4, f, 0, 0, d) + +#define MMIO_RING_GM (prefix, d) \ + MMIO_RING_F(prefix, 4, F_GMADR, 0xFFFF0000, 0, d) + +#define MMIO_RING_GM_RDR (prefix, d) \ + MMIO_RING_F(prefix, 4, F_GMADR | F_CMD_ACCESS, 0xFFFF0000, 0, d) + +#define MMIO_RING_RO (prefix, d, f, rm) \ + MMIO_RING_F(prefix, 4, F_RO | f, 0, rm, d) + +static int iterate_generic_mmio (struct intel_gvt_mmio_table_iter *iter) +{ +struct drm_i915_private *dev_priv = iter->i915; +int ret; + +MMIO_RING_D (RING_IMR ,D_ALL ); +MMIO_D (SDEIMR ,D_ALL ); +MMIO_D (SDEIER ,D_ALL ); +MMIO_D (SDEIIR ,D_ALL ); +MMIO_D (SDEISR ,D_ALL ); +MMIO_RING_D (RING_HWSTAM ,D_ALL ); +MMIO_D (GEN8_GAMW_ECO_DEV_RW_IA ,D_BDW_PLUS ); +MMIO_GM_RDR (BSD_HWS_PGA_GEN7 ,D_ALL ); +MMIO_GM_RDR (BLT_HWS_PGA_GEN7 ,D_ALL ); +MMIO_GM_RDR (VEBOX_HWS_PGA_GEN7 ,D_ALL ); + +#define RING_REG (base) _MMIO((base) + 0x28) +MMIO_RING_DF (RING_REG ,D_ALL ,F_CMD_ACCESS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x134) +MMIO_RING_DF (RING_REG ,D_ALL ,F_CMD_ACCESS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x6c) +MMIO_RING_D (RING_REG ,D_ALL ); +#undef RING_REG +MMIO_D (GEN7_SC_INSTDONE ,D_BDW_PLUS ); +MMIO_GM_RDR (_MMIO (0x2148 ),D_ALL ); +MMIO_GM_RDR (CCID (RENDER_RING_BASE ),D_ALL ); +MMIO_GM_RDR (_MMIO (0x12198 ),D_ALL ); +MMIO_D (GEN7_CXT_SIZE ,D_ALL ); +MMIO_RING_D (RING_TAIL ,D_ALL ); +MMIO_RING_D (RING_HEAD ,D_ALL ); +MMIO_RING_D (RING_CTL ,D_ALL ); +MMIO_RING_D (RING_ACTHD ,D_ALL ); +MMIO_RING_GM (RING_START ,D_ALL ); + +/* RING MODE */ +#define RING_REG (base) _MMIO((base) + 0x29c) +MMIO_RING_DF (RING_REG ,D_ALL , +F_MODE_MASK |F_CMD_ACCESS |F_CMD_WRITE_PATCH ); +#undef RING_REG + +MMIO_RING_DF (RING_MI_MODE ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_RING_DF (RING_INSTPM ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_RING_DF (RING_TIMESTAMP ,D_ALL ,F_CMD_ACCESS ); +MMIO_RING_DF (RING_TIMESTAMP_UDW ,D_ALL ,F_CMD_ACCESS ); +MMIO_DF (GEN7_GT_MODE ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (CACHE_MODE_0_GEN7 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (CACHE_MODE_1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (CACHE_MODE_0 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2124 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x20dc ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (_3D_CHICKEN3,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2088 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (FF_SLICE_CS_CHICKEN2 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2470 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (GAM_ECOCHK ,D_ALL ,F_CMD_ACCESS ); +MMIO_DF (GEN7_COMMON_SLICE_CHICKEN1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (COMMON_SLICE_CHICKEN2 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x9030 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x20a0 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2420 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2430 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2434 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2438 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x243c ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x7018 ),D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (HALF_SLICE_CHICKEN3 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_DF (GEN7_HALF_SLICE_CHICKEN1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +/* display */ +MMIO_F (_MMIO (0x60220 ),0x20 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (_MMIO (0x602a0 ),D_ALL ); +MMIO_D (_MMIO (0x65050 ),D_ALL ); +MMIO_D (_MMIO (0x650b4 ),D_ALL ); +MMIO_D (_MMIO (0xc4040 ),D_ALL ); +MMIO_D (DERRMR ,D_ALL ); +MMIO_D (PIPEDSL (PIPE_A ),D_ALL ); +MMIO_D (PIPEDSL (PIPE_B ),D_ALL ); +MMIO_D (PIPEDSL (PIPE_C ),D_ALL ); +MMIO_D (PIPEDSL (_PIPE_EDP),D_ALL ); +MMIO_D (PIPECONF (PIPE_A ),D_ALL ); +MMIO_D (PIPECONF (PIPE_B ),D_ALL ); +MMIO_D (PIPECONF (PIPE_C ),D_ALL ); +MMIO_D (PIPECONF (_PIPE_EDP),D_ALL ); +MMIO_D (PIPESTAT (PIPE_A ),D_ALL ); +MMIO_D (PIPESTAT (PIPE_B ),D_ALL ); +MMIO_D (PIPESTAT (PIPE_C ),D_ALL ); +MMIO_D (PIPESTAT (_PIPE_EDP),D_ALL ); +MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_A ),D_ALL ); +MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_B ),D_ALL ); +MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_C ),D_ALL ); +MMIO_D (PIPE_FLIPCOUNT_G4X (_PIPE_EDP),D_ALL ); +MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_A ),D_ALL ); +MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_B ),D_ALL ); +MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_C ),D_ALL ); +MMIO_D (PIPE_FRMCOUNT_G4X (_PIPE_EDP),D_ALL ); +MMIO_D (CURCNTR (PIPE_A ),D_ALL ); +MMIO_D (CURCNTR (PIPE_B ),D_ALL ); +MMIO_D (CURCNTR (PIPE_C ),D_ALL ); +MMIO_D (CURPOS (PIPE_A ),D_ALL ); +MMIO_D (CURPOS (PIPE_B ),D_ALL ); +MMIO_D (CURPOS (PIPE_C ),D_ALL ); +MMIO_D (CURBASE (PIPE_A ),D_ALL ); +MMIO_D (CURBASE (PIPE_B ),D_ALL ); +MMIO_D (CURBASE (PIPE_C ),D_ALL ); +MMIO_D (CUR_FBC_CTL (PIPE_A ),D_ALL ); +MMIO_D (CUR_FBC_CTL (PIPE_B ),D_ALL ); +MMIO_D (CUR_FBC_CTL (PIPE_C ),D_ALL ); +MMIO_D (_MMIO (0x700ac ),D_ALL ); +MMIO_D (_MMIO (0x710ac ),D_ALL ); +MMIO_D (_MMIO (0x720ac ),D_ALL ); +MMIO_D (_MMIO (0x70090 ),D_ALL ); +MMIO_D (_MMIO (0x70094 ),D_ALL ); +MMIO_D (_MMIO (0x70098 ),D_ALL ); +MMIO_D (_MMIO (0x7009c ),D_ALL ); +MMIO_D (DSPCNTR (PIPE_A ),D_ALL ); +MMIO_D (DSPADDR (PIPE_A ),D_ALL ); +MMIO_D (DSPSTRIDE (PIPE_A ),D_ALL ); +MMIO_D (DSPPOS (PIPE_A ),D_ALL ); +MMIO_D (DSPSIZE (PIPE_A ),D_ALL ); +MMIO_D (DSPSURF (PIPE_A ),D_ALL ); +MMIO_D (DSPOFFSET (PIPE_A ),D_ALL ); +MMIO_D (DSPSURFLIVE (PIPE_A ),D_ALL ); +MMIO_D (REG_50080 (PIPE_A ,PLANE_PRIMARY ),D_ALL ); +MMIO_D (DSPCNTR (PIPE_B ),D_ALL ); +MMIO_D (DSPADDR (PIPE_B ),D_ALL ); +MMIO_D (DSPSTRIDE (PIPE_B ),D_ALL ); +MMIO_D (DSPPOS (PIPE_B ),D_ALL ); +MMIO_D (DSPSIZE (PIPE_B ),D_ALL ); +MMIO_D (DSPSURF (PIPE_B ),D_ALL ); +MMIO_D (DSPOFFSET (PIPE_B ),D_ALL ); +MMIO_D (DSPSURFLIVE (PIPE_B ),D_ALL ); +MMIO_D (REG_50080 (PIPE_B ,PLANE_PRIMARY ),D_ALL ); +MMIO_D (DSPCNTR (PIPE_C ),D_ALL ); +MMIO_D (DSPADDR (PIPE_C ),D_ALL ); +MMIO_D (DSPSTRIDE (PIPE_C ),D_ALL ); +MMIO_D (DSPPOS (PIPE_C ),D_ALL ); +MMIO_D (DSPSIZE (PIPE_C ),D_ALL ); +MMIO_D (DSPSURF (PIPE_C ),D_ALL ); +MMIO_D (DSPOFFSET (PIPE_C ),D_ALL ); +MMIO_D (DSPSURFLIVE (PIPE_C ),D_ALL ); +MMIO_D (REG_50080 (PIPE_C ,PLANE_PRIMARY ),D_ALL ); +MMIO_D (SPRCTL (PIPE_A ),D_ALL ); +MMIO_D (SPRLINOFF (PIPE_A ),D_ALL ); +MMIO_D (SPRSTRIDE (PIPE_A ),D_ALL ); +MMIO_D (SPRPOS (PIPE_A ),D_ALL ); +MMIO_D (SPRSIZE (PIPE_A ),D_ALL ); +MMIO_D (SPRKEYVAL (PIPE_A ),D_ALL ); +MMIO_D (SPRKEYMSK (PIPE_A ),D_ALL ); +MMIO_D (SPRSURF (PIPE_A ),D_ALL ); +MMIO_D (SPRKEYMAX (PIPE_A ),D_ALL ); +MMIO_D (SPROFFSET (PIPE_A ),D_ALL ); +MMIO_D (SPRSCALE (PIPE_A ),D_ALL ); +MMIO_D (SPRSURFLIVE (PIPE_A ),D_ALL ); +MMIO_D (REG_50080 (PIPE_A ,PLANE_SPRITE0 ),D_ALL ); +MMIO_D (SPRCTL (PIPE_B ),D_ALL ); +MMIO_D (SPRLINOFF (PIPE_B ),D_ALL ); +MMIO_D (SPRSTRIDE (PIPE_B ),D_ALL ); +MMIO_D (SPRPOS (PIPE_B ),D_ALL ); +MMIO_D (SPRSIZE (PIPE_B ),D_ALL ); +MMIO_D (SPRKEYVAL (PIPE_B ),D_ALL ); +MMIO_D (SPRKEYMSK (PIPE_B ),D_ALL ); +MMIO_D (SPRSURF (PIPE_B ),D_ALL ); +MMIO_D (SPRKEYMAX (PIPE_B ),D_ALL ); +MMIO_D (SPROFFSET (PIPE_B ),D_ALL ); +MMIO_D (SPRSCALE (PIPE_B ),D_ALL ); +MMIO_D (SPRSURFLIVE (PIPE_B ),D_ALL ); +MMIO_D (REG_50080 (PIPE_B ,PLANE_SPRITE0 ),D_ALL ); +MMIO_D (SPRCTL (PIPE_C ),D_ALL ); +MMIO_D (SPRLINOFF (PIPE_C ),D_ALL ); +MMIO_D (SPRSTRIDE (PIPE_C ),D_ALL ); +MMIO_D (SPRPOS (PIPE_C ),D_ALL ); +MMIO_D (SPRSIZE (PIPE_C ),D_ALL ); +MMIO_D (SPRKEYVAL (PIPE_C ),D_ALL ); +MMIO_D (SPRKEYMSK (PIPE_C ),D_ALL ); +MMIO_D (SPRSURF (PIPE_C ),D_ALL ); +MMIO_D (SPRKEYMAX (PIPE_C ),D_ALL ); +MMIO_D (SPROFFSET (PIPE_C ),D_ALL ); +MMIO_D (SPRSCALE (PIPE_C ),D_ALL ); +MMIO_D (SPRSURFLIVE (PIPE_C ),D_ALL ); +MMIO_D (REG_50080 (PIPE_C ,PLANE_SPRITE0 ),D_ALL ); +MMIO_D (HTOTAL (TRANSCODER_A ),D_ALL ); +MMIO_D (HBLANK (TRANSCODER_A ),D_ALL ); +MMIO_D (HSYNC (TRANSCODER_A ),D_ALL ); +MMIO_D (VTOTAL (TRANSCODER_A ),D_ALL ); +MMIO_D (VBLANK (TRANSCODER_A ),D_ALL ); +MMIO_D (VSYNC (TRANSCODER_A ),D_ALL ); +MMIO_D (BCLRPAT (TRANSCODER_A ),D_ALL ); +MMIO_D (VSYNCSHIFT (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPESRC (TRANSCODER_A ),D_ALL ); +MMIO_D (HTOTAL (TRANSCODER_B ),D_ALL ); +MMIO_D (HBLANK (TRANSCODER_B ),D_ALL ); +MMIO_D (HSYNC (TRANSCODER_B ),D_ALL ); +MMIO_D (VTOTAL (TRANSCODER_B ),D_ALL ); +MMIO_D (VBLANK (TRANSCODER_B ),D_ALL ); +MMIO_D (VSYNC (TRANSCODER_B ),D_ALL ); +MMIO_D (BCLRPAT (TRANSCODER_B ),D_ALL ); +MMIO_D (VSYNCSHIFT (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPESRC (TRANSCODER_B ),D_ALL ); +MMIO_D (HTOTAL (TRANSCODER_C ),D_ALL ); +MMIO_D (HBLANK (TRANSCODER_C ),D_ALL ); +MMIO_D (HSYNC (TRANSCODER_C ),D_ALL ); +MMIO_D (VTOTAL (TRANSCODER_C ),D_ALL ); +MMIO_D (VBLANK (TRANSCODER_C ),D_ALL ); +MMIO_D (VSYNC (TRANSCODER_C ),D_ALL ); +MMIO_D (BCLRPAT (TRANSCODER_C ),D_ALL ); +MMIO_D (VSYNCSHIFT (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPESRC (TRANSCODER_C ),D_ALL ); +MMIO_D (HTOTAL (TRANSCODER_EDP ),D_ALL ); +MMIO_D (HBLANK (TRANSCODER_EDP ),D_ALL ); +MMIO_D (HSYNC (TRANSCODER_EDP ),D_ALL ); +MMIO_D (VTOTAL (TRANSCODER_EDP ),D_ALL ); +MMIO_D (VBLANK (TRANSCODER_EDP ),D_ALL ); +MMIO_D (VSYNC (TRANSCODER_EDP ),D_ALL ); +MMIO_D (BCLRPAT (TRANSCODER_EDP ),D_ALL ); +MMIO_D (VSYNCSHIFT (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_DATA_M1 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_DATA_N1 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_DATA_M2 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_DATA_N2 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_LINK_M1 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_LINK_N1 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_LINK_M2 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_LINK_N2 (TRANSCODER_A ),D_ALL ); +MMIO_D (PIPE_DATA_M1 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_DATA_N1 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_DATA_M2 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_DATA_N2 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_LINK_M1 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_LINK_N1 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_LINK_M2 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_LINK_N2 (TRANSCODER_B ),D_ALL ); +MMIO_D (PIPE_DATA_M1 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_DATA_N1 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_DATA_M2 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_DATA_N2 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_LINK_M1 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_LINK_N1 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_LINK_M2 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_LINK_N2 (TRANSCODER_C ),D_ALL ); +MMIO_D (PIPE_DATA_M1 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_DATA_N1 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_DATA_M2 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_DATA_N2 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_LINK_M1 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_LINK_N1 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_LINK_M2 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PIPE_LINK_N2 (TRANSCODER_EDP ),D_ALL ); +MMIO_D (PF_CTL (PIPE_A ),D_ALL ); +MMIO_D (PF_WIN_SZ (PIPE_A ),D_ALL ); +MMIO_D (PF_WIN_POS (PIPE_A ),D_ALL ); +MMIO_D (PF_VSCALE (PIPE_A ),D_ALL ); +MMIO_D (PF_HSCALE (PIPE_A ),D_ALL ); +MMIO_D (PF_CTL (PIPE_B ),D_ALL ); +MMIO_D (PF_WIN_SZ (PIPE_B ),D_ALL ); +MMIO_D (PF_WIN_POS (PIPE_B ),D_ALL ); +MMIO_D (PF_VSCALE (PIPE_B ),D_ALL ); +MMIO_D (PF_HSCALE (PIPE_B ),D_ALL ); +MMIO_D (PF_CTL (PIPE_C ),D_ALL ); +MMIO_D (PF_WIN_SZ (PIPE_C ),D_ALL ); +MMIO_D (PF_WIN_POS (PIPE_C ),D_ALL ); +MMIO_D (PF_VSCALE (PIPE_C ),D_ALL ); +MMIO_D (PF_HSCALE (PIPE_C ),D_ALL ); +MMIO_D (WM0_PIPE_ILK (PIPE_A ),D_ALL ); +MMIO_D (WM0_PIPE_ILK (PIPE_B ),D_ALL ); +MMIO_D (WM0_PIPE_ILK (PIPE_C ),D_ALL ); +MMIO_D (WM1_LP_ILK ,D_ALL ); +MMIO_D (WM2_LP_ILK ,D_ALL ); +MMIO_D (WM3_LP_ILK ,D_ALL ); +MMIO_D (WM1S_LP_ILK ,D_ALL ); +MMIO_D (WM2S_LP_IVB ,D_ALL ); +MMIO_D (WM3S_LP_IVB ,D_ALL ); +MMIO_D (BLC_PWM_CPU_CTL2 ,D_ALL ); +MMIO_D (BLC_PWM_CPU_CTL ,D_ALL ); +MMIO_D (BLC_PWM_PCH_CTL1 ,D_ALL ); +MMIO_D (BLC_PWM_PCH_CTL2 ,D_ALL ); +MMIO_D (_MMIO (0x48268 ),D_ALL ); +MMIO_F (PCH_GMBUS0 ,4 *4 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (PCH_GPIO_BASE ,6 *4 ,F_UNALIGN ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0xe4f00 ),0x28 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (_PCH_DPB_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (_PCH_DPC_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (_PCH_DPD_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_D (PCH_ADPA ,D_PRE_SKL ); +MMIO_D (_MMIO (_PCH_TRANSACONF),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSBCONF),D_ALL ); +MMIO_D (FDI_RX_IIR (PIPE_A ),D_ALL ); +MMIO_D (FDI_RX_IIR (PIPE_B ),D_ALL ); +MMIO_D (FDI_RX_IIR (PIPE_C ),D_ALL ); +MMIO_D (FDI_RX_IMR (PIPE_A ),D_ALL ); +MMIO_D (FDI_RX_IMR (PIPE_B ),D_ALL ); +MMIO_D (FDI_RX_IMR (PIPE_C ),D_ALL ); +MMIO_D (FDI_RX_CTL (PIPE_A ),D_ALL ); +MMIO_D (FDI_RX_CTL (PIPE_B ),D_ALL ); +MMIO_D (FDI_RX_CTL (PIPE_C ),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_HTOTAL_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_HBLANK_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_HSYNC_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VTOTAL_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VBLANK_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VSYNC_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VSYNCSHIFT_A),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_HTOTAL_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_HBLANK_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_HSYNC_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VTOTAL_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VBLANK_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VSYNC_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANS_VSYNCSHIFT_B),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_DATA_M1),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_DATA_N1),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_DATA_M2),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_DATA_N2),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_LINK_M1),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_LINK_N1),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_LINK_M2),D_ALL ); +MMIO_D (_MMIO (_PCH_TRANSA_LINK_N2),D_ALL ); +MMIO_D (TRANS_DP_CTL (PIPE_A ),D_ALL ); +MMIO_D (TRANS_DP_CTL (PIPE_B ),D_ALL ); +MMIO_D (TRANS_DP_CTL (PIPE_C ),D_ALL ); +MMIO_D (TVIDEO_DIP_CTL (PIPE_A ),D_ALL ); +MMIO_D (TVIDEO_DIP_DATA (PIPE_A ),D_ALL ); +MMIO_D (TVIDEO_DIP_GCP (PIPE_A ),D_ALL ); +MMIO_D (TVIDEO_DIP_CTL (PIPE_B ),D_ALL ); +MMIO_D (TVIDEO_DIP_DATA (PIPE_B ),D_ALL ); +MMIO_D (TVIDEO_DIP_GCP (PIPE_B ),D_ALL ); +MMIO_D (TVIDEO_DIP_CTL (PIPE_C ),D_ALL ); +MMIO_D (TVIDEO_DIP_DATA (PIPE_C ),D_ALL ); +MMIO_D (TVIDEO_DIP_GCP (PIPE_C ),D_ALL ); +MMIO_D (_MMIO (_FDI_RXA_MISC),D_ALL ); +MMIO_D (_MMIO (_FDI_RXB_MISC),D_ALL ); +MMIO_D (_MMIO (_FDI_RXA_TUSIZE1),D_ALL ); +MMIO_D (_MMIO (_FDI_RXA_TUSIZE2),D_ALL ); +MMIO_D (_MMIO (_FDI_RXB_TUSIZE1),D_ALL ); +MMIO_D (_MMIO (_FDI_RXB_TUSIZE2),D_ALL ); +MMIO_D (PCH_PP_CONTROL ,D_ALL ); +MMIO_D (PCH_PP_DIVISOR ,D_ALL ); +MMIO_D (PCH_PP_STATUS ,D_ALL ); +MMIO_D (PCH_LVDS ,D_ALL ); +MMIO_D (_MMIO (_PCH_DPLL_A),D_ALL ); +MMIO_D (_MMIO (_PCH_DPLL_B),D_ALL ); +MMIO_D (_MMIO (_PCH_FPA0),D_ALL ); +MMIO_D (_MMIO (_PCH_FPA1),D_ALL ); +MMIO_D (_MMIO (_PCH_FPB0),D_ALL ); +MMIO_D (_MMIO (_PCH_FPB1),D_ALL ); +MMIO_D (PCH_DREF_CONTROL ,D_ALL ); +MMIO_D (PCH_RAWCLK_FREQ ,D_ALL ); +MMIO_D (PCH_DPLL_SEL ,D_ALL ); +MMIO_D (_MMIO (0x61208 ),D_ALL ); +MMIO_D (_MMIO (0x6120c ),D_ALL ); +MMIO_D (PCH_PP_ON_DELAYS ,D_ALL ); +MMIO_D (PCH_PP_OFF_DELAYS ,D_ALL ); +MMIO_D (_MMIO (0xe651c ),D_ALL ); +MMIO_D (_MMIO (0xe661c ),D_ALL ); +MMIO_D (_MMIO (0xe671c ),D_ALL ); +MMIO_D (_MMIO (0xe681c ),D_ALL ); +MMIO_D (_MMIO (0xe6c04 ),D_ALL ); +MMIO_D (_MMIO (0xe6e1c ),D_ALL ); +MMIO_RO (PCH_PORT_HOTPLUG ,D_ALL ,0 , +PORTA_HOTPLUG_STATUS_MASK + |PORTB_HOTPLUG_STATUS_MASK + |PORTC_HOTPLUG_STATUS_MASK + |PORTD_HOTPLUG_STATUS_MASK ); +MMIO_D (LCPLL_CTL ,D_ALL ); +MMIO_D (FUSE_STRAP ,D_ALL ); +MMIO_D (DIGITAL_PORT_HOTPLUG_CNTRL ,D_ALL ); +MMIO_D (DISP_ARB_CTL ,D_ALL ); +MMIO_D (DISP_ARB_CTL2 ,D_ALL ); +MMIO_D (ILK_DISPLAY_CHICKEN1 ,D_ALL ); +MMIO_D (ILK_DISPLAY_CHICKEN2 ,D_ALL ); +MMIO_D (ILK_DSPCLK_GATE_D ,D_ALL ); +MMIO_D (SOUTH_CHICKEN1 ,D_ALL ); +MMIO_D (SOUTH_CHICKEN2 ,D_ALL ); +MMIO_D (_MMIO (_TRANSA_CHICKEN1),D_ALL ); +MMIO_D (_MMIO (_TRANSB_CHICKEN1),D_ALL ); +MMIO_D (SOUTH_DSPCLK_GATE_D ,D_ALL ); +MMIO_D (_MMIO (_TRANSA_CHICKEN2),D_ALL ); +MMIO_D (_MMIO (_TRANSB_CHICKEN2),D_ALL ); +MMIO_D (ILK_DPFC_CB_BASE (INTEL_FBC_A ),D_ALL ); +MMIO_D (ILK_DPFC_CONTROL (INTEL_FBC_A ),D_ALL ); +MMIO_D (ILK_DPFC_RECOMP_CTL (INTEL_FBC_A ),D_ALL ); +MMIO_D (ILK_DPFC_STATUS (INTEL_FBC_A ),D_ALL ); +MMIO_D (ILK_DPFC_FENCE_YOFF (INTEL_FBC_A ),D_ALL ); +MMIO_D (ILK_DPFC_CHICKEN (INTEL_FBC_A ),D_ALL ); +MMIO_D (ILK_FBC_RT_BASE ,D_ALL ); +MMIO_D (IPS_CTL ,D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RY_GY (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BY (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RU_GU (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BU (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RV_GV (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BV (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_MODE (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_HI (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_ME (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_LO (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_HI (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_ME (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_LO (PIPE_A ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RY_GY (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BY (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RU_GU (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BU (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RV_GV (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BV (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_MODE (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_HI (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_ME (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_LO (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_HI (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_ME (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_LO (PIPE_B ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RY_GY (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BY (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RU_GU (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BU (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_RV_GV (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_COEFF_BV (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_MODE (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_HI (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_ME (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_PREOFF_LO (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_HI (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_ME (PIPE_C ),D_ALL ); +MMIO_D (PIPE_CSC_POSTOFF_LO (PIPE_C ),D_ALL ); +MMIO_D (PREC_PAL_INDEX (PIPE_A ),D_ALL ); +MMIO_D (PREC_PAL_DATA (PIPE_A ),D_ALL ); +MMIO_F (PREC_PAL_GC_MAX (PIPE_A ,0 ),4 *3 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (PREC_PAL_INDEX (PIPE_B ),D_ALL ); +MMIO_D (PREC_PAL_DATA (PIPE_B ),D_ALL ); +MMIO_F (PREC_PAL_GC_MAX (PIPE_B ,0 ),4 *3 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (PREC_PAL_INDEX (PIPE_C ),D_ALL ); +MMIO_D (PREC_PAL_DATA (PIPE_C ),D_ALL ); +MMIO_F (PREC_PAL_GC_MAX (PIPE_C ,0 ),4 *3 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (_MMIO (0x60110 ),D_ALL ); +MMIO_D (_MMIO (0x61110 ),D_ALL ); +MMIO_F (_MMIO (0x70400 ),0x40 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x71400 ),0x40 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x72400 ),0x40 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x70440 ),0xc ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (0x71440 ),0xc ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (0x72440 ),0xc ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (0x7044c ),0xc ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (0x7144c ),0xc ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_F (_MMIO (0x7244c ),0xc ,0 ,0 ,0 ,D_PRE_SKL ); +MMIO_D (WM_LINETIME (PIPE_A ),D_ALL ); +MMIO_D (WM_LINETIME (PIPE_B ),D_ALL ); +MMIO_D (WM_LINETIME (PIPE_C ),D_ALL ); +MMIO_D (SPLL_CTL ,D_ALL ); +MMIO_D (_MMIO (_WRPLL_CTL1),D_ALL ); +MMIO_D (_MMIO (_WRPLL_CTL2),D_ALL ); +MMIO_D (PORT_CLK_SEL (PORT_A ),D_ALL ); +MMIO_D (PORT_CLK_SEL (PORT_B ),D_ALL ); +MMIO_D (PORT_CLK_SEL (PORT_C ),D_ALL ); +MMIO_D (PORT_CLK_SEL (PORT_D ),D_ALL ); +MMIO_D (PORT_CLK_SEL (PORT_E ),D_ALL ); +MMIO_D (TRANS_CLK_SEL (TRANSCODER_A ),D_ALL ); +MMIO_D (TRANS_CLK_SEL (TRANSCODER_B ),D_ALL ); +MMIO_D (TRANS_CLK_SEL (TRANSCODER_C ),D_ALL ); +MMIO_D (HSW_NDE_RSTWRN_OPT ,D_ALL ); +MMIO_D (_MMIO (0x46508 ),D_ALL ); +MMIO_D (_MMIO (0x49080 ),D_ALL ); +MMIO_D (_MMIO (0x49180 ),D_ALL ); +MMIO_D (_MMIO (0x49280 ),D_ALL ); +MMIO_F (_MMIO (0x49090 ),0x14 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x49190 ),0x14 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x49290 ),0x14 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (GAMMA_MODE (PIPE_A ),D_ALL ); +MMIO_D (GAMMA_MODE (PIPE_B ),D_ALL ); +MMIO_D (GAMMA_MODE (PIPE_C ),D_ALL ); +MMIO_D (PIPE_MULT (PIPE_A ),D_ALL ); +MMIO_D (PIPE_MULT (PIPE_B ),D_ALL ); +MMIO_D (PIPE_MULT (PIPE_C ),D_ALL ); +MMIO_D (HSW_TVIDEO_DIP_CTL (TRANSCODER_A ),D_ALL ); +MMIO_D (HSW_TVIDEO_DIP_CTL (TRANSCODER_B ),D_ALL ); +MMIO_D (HSW_TVIDEO_DIP_CTL (TRANSCODER_C ),D_ALL ); +MMIO_D (SFUSE_STRAP ,D_ALL ); +MMIO_D (SBI_ADDR ,D_ALL ); +MMIO_D (SBI_DATA ,D_ALL ); +MMIO_D (SBI_CTL_STAT ,D_ALL ); +MMIO_D (PIXCLK_GATE ,D_ALL ); +MMIO_F (_MMIO (_DPA_AUX_CH_CTL),6 *4 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (DDI_BUF_CTL (PORT_A ),D_ALL ); +MMIO_D (DDI_BUF_CTL (PORT_B ),D_ALL ); +MMIO_D (DDI_BUF_CTL (PORT_C ),D_ALL ); +MMIO_D (DDI_BUF_CTL (PORT_D ),D_ALL ); +MMIO_D (DDI_BUF_CTL (PORT_E ),D_ALL ); +MMIO_D (DP_TP_CTL (PORT_A ),D_ALL ); +MMIO_D (DP_TP_CTL (PORT_B ),D_ALL ); +MMIO_D (DP_TP_CTL (PORT_C ),D_ALL ); +MMIO_D (DP_TP_CTL (PORT_D ),D_ALL ); +MMIO_D (DP_TP_CTL (PORT_E ),D_ALL ); +MMIO_D (DP_TP_STATUS (PORT_A ),D_ALL ); +MMIO_D (DP_TP_STATUS (PORT_B ),D_ALL ); +MMIO_D (DP_TP_STATUS (PORT_C ),D_ALL ); +MMIO_D (DP_TP_STATUS (PORT_D ),D_ALL ); +MMIO_D (DP_TP_STATUS (PORT_E ),D_ALL ); +MMIO_F (_MMIO (_DDI_BUF_TRANS_A),0x50 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x64e60 ),0x50 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x64eC0 ),0x50 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x64f20 ),0x50 ,0 ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x64f80 ),0x50 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (HSW_AUD_CFG (PIPE_A ),D_ALL ); +MMIO_D (HSW_AUD_PIN_ELD_CP_VLD ,D_ALL ); +MMIO_D (HSW_AUD_MISC_CTRL (PIPE_A ),D_ALL ); +MMIO_D (_MMIO (_TRANS_DDI_FUNC_CTL_A),D_ALL ); +MMIO_D (_MMIO (_TRANS_DDI_FUNC_CTL_B),D_ALL ); +MMIO_D (_MMIO (_TRANS_DDI_FUNC_CTL_C),D_ALL ); +MMIO_D (_MMIO (_TRANS_DDI_FUNC_CTL_EDP),D_ALL ); +MMIO_D (_MMIO (_TRANSA_MSA_MISC),D_ALL ); +MMIO_D (_MMIO (_TRANSB_MSA_MISC),D_ALL ); +MMIO_D (_MMIO (_TRANSC_MSA_MISC),D_ALL ); +MMIO_D (_MMIO (_TRANS_EDP_MSA_MISC),D_ALL ); +MMIO_D (FORCEWAKE ,D_ALL ); +MMIO_D (FORCEWAKE_ACK ,D_ALL ); +MMIO_D (GEN6_GT_CORE_STATUS ,D_ALL ); +MMIO_D (GEN6_GT_THREAD_STATUS_REG ,D_ALL ); +MMIO_DF (GTFIFODBG ,D_ALL ,F_CMD_ACCESS ); +MMIO_DF (GTFIFOCTL ,D_ALL ,F_CMD_ACCESS ); +MMIO_D (FORCEWAKE_MT ,D_PRE_SKL ); +MMIO_D (FORCEWAKE_ACK_HSW ,D_BDW ); +MMIO_D (ECOBUS ,D_ALL ); +MMIO_D (GEN6_RC_CONTROL ,D_ALL ); +MMIO_D (GEN6_RC_STATE ,D_ALL ); +MMIO_D (GEN6_RPNSWREQ ,D_ALL ); +MMIO_D (GEN6_RC_VIDEO_FREQ ,D_ALL ); +MMIO_D (GEN6_RP_DOWN_TIMEOUT ,D_ALL ); +MMIO_D (GEN6_RP_INTERRUPT_LIMITS ,D_ALL ); +MMIO_D (GEN6_RPSTAT1 ,D_ALL ); +MMIO_D (GEN6_RP_CONTROL ,D_ALL ); +MMIO_D (GEN6_RP_UP_THRESHOLD ,D_ALL ); +MMIO_D (GEN6_RP_DOWN_THRESHOLD ,D_ALL ); +MMIO_D (GEN6_RP_CUR_UP_EI ,D_ALL ); +MMIO_D (GEN6_RP_CUR_UP ,D_ALL ); +MMIO_D (GEN6_RP_PREV_UP ,D_ALL ); +MMIO_D (GEN6_RP_CUR_DOWN_EI ,D_ALL ); +MMIO_D (GEN6_RP_CUR_DOWN ,D_ALL ); +MMIO_D (GEN6_RP_PREV_DOWN ,D_ALL ); +MMIO_D (GEN6_RP_UP_EI ,D_ALL ); +MMIO_D (GEN6_RP_DOWN_EI ,D_ALL ); +MMIO_D (GEN6_RP_IDLE_HYSTERSIS ,D_ALL ); +MMIO_D (GEN6_RC1_WAKE_RATE_LIMIT ,D_ALL ); +MMIO_D (GEN6_RC6_WAKE_RATE_LIMIT ,D_ALL ); +MMIO_D (GEN6_RC6pp_WAKE_RATE_LIMIT,D_ALL ); +MMIO_D (GEN6_RC_EVALUATION_INTERVAL ,D_ALL ); +MMIO_D (GEN6_RC_IDLE_HYSTERSIS ,D_ALL ); +MMIO_D (GEN6_RC_SLEEP ,D_ALL ); +MMIO_D (GEN6_RC1e_THRESHOLD,D_ALL ); +MMIO_D (GEN6_RC6_THRESHOLD ,D_ALL ); +MMIO_D (GEN6_RC6p_THRESHOLD,D_ALL ); +MMIO_D (GEN6_RC6pp_THRESHOLD,D_ALL ); +MMIO_D (GEN6_PMINTRMSK ,D_ALL ); +MMIO_D (HSW_PWR_WELL_CTL1 ,D_BDW ); +MMIO_D (HSW_PWR_WELL_CTL2 ,D_BDW ); +MMIO_D (HSW_PWR_WELL_CTL3 ,D_BDW ); +MMIO_D (HSW_PWR_WELL_CTL4 ,D_BDW ); +MMIO_D (HSW_PWR_WELL_CTL5 ,D_BDW ); +MMIO_D (HSW_PWR_WELL_CTL6 ,D_BDW ); +MMIO_D (RSTDBYCTL ,D_ALL ); +MMIO_D (GEN6_GDRST ,D_ALL ); +MMIO_F (FENCE_REG_GEN6_LO (0 ),0x80 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (CPU_VGACNTRL ,D_ALL ); +MMIO_D (TILECTL ,D_ALL ); +MMIO_D (GEN6_UCGCTL1 ,D_ALL ); +MMIO_D (GEN6_UCGCTL2 ,D_ALL ); +MMIO_F (_MMIO (0x4f000 ),0x90 ,0 ,0 ,0 ,D_ALL ); +MMIO_D (GEN6_PCODE_DATA ,D_ALL ); +MMIO_D (_MMIO (0x13812c ),D_ALL ); +MMIO_D (GEN7_ERR_INT ,D_ALL ); +MMIO_D (HSW_EDRAM_CAP ,D_ALL ); +MMIO_D (HSW_IDICR ,D_ALL ); +MMIO_D (GFX_FLSH_CNTL_GEN6 ,D_ALL ); +MMIO_D (_MMIO (0x3c ),D_ALL ); +MMIO_D (_MMIO (0x860 ),D_ALL ); +MMIO_D (ECOSKPD (RENDER_RING_BASE ),D_ALL ); +MMIO_D (_MMIO (0x121d0 ),D_ALL ); +MMIO_D (ECOSKPD (BLT_RING_BASE ),D_ALL ); +MMIO_D (_MMIO (0x41d0 ),D_ALL ); +MMIO_D (GAC_ECO_BITS ,D_ALL ); +MMIO_D (_MMIO (0x6200 ),D_ALL ); +MMIO_D (_MMIO (0x6204 ),D_ALL ); +MMIO_D (_MMIO (0x6208 ),D_ALL ); +MMIO_D (_MMIO (0x7118 ),D_ALL ); +MMIO_D (_MMIO (0x7180 ),D_ALL ); +MMIO_D (_MMIO (0x7408 ),D_ALL ); +MMIO_D (_MMIO (0x7c00 ),D_ALL ); +MMIO_D (GEN6_MBCTL ,D_ALL ); +MMIO_D (_MMIO (0x911c ),D_ALL ); +MMIO_D (_MMIO (0x9120 ),D_ALL ); +MMIO_DF (GEN7_UCGCTL4 ,D_ALL ,F_CMD_ACCESS ); +MMIO_D (GAB_CTL ,D_ALL ); +MMIO_D (_MMIO (0x48800 ),D_ALL ); +MMIO_D (_MMIO (0xce044 ),D_ALL ); +MMIO_D (_MMIO (0xe6500 ),D_ALL ); +MMIO_D (_MMIO (0xe6504 ),D_ALL ); +MMIO_D (_MMIO (0xe6600 ),D_ALL ); +MMIO_D (_MMIO (0xe6604 ),D_ALL ); +MMIO_D (_MMIO (0xe6700 ),D_ALL ); +MMIO_D (_MMIO (0xe6704 ),D_ALL ); +MMIO_D (_MMIO (0xe6800 ),D_ALL ); +MMIO_D (_MMIO (0xe6804 ),D_ALL ); +MMIO_D (PCH_GMBUS4 ,D_ALL ); +MMIO_D (PCH_GMBUS5 ,D_ALL ); +MMIO_D (_MMIO (0x902c ),D_ALL ); +MMIO_D (_MMIO (0xec008 ),D_ALL ); +MMIO_D (_MMIO (0xec00c ),D_ALL ); +MMIO_D (_MMIO (0xec008 +0x18 ),D_ALL ); +MMIO_D (_MMIO (0xec00c +0x18 ),D_ALL ); +MMIO_D (_MMIO (0xec008 +0x18 *2 ),D_ALL ); +MMIO_D (_MMIO (0xec00c +0x18 *2 ),D_ALL ); +MMIO_D (_MMIO (0xec008 +0x18 *3 ),D_ALL ); +MMIO_D (_MMIO (0xec00c +0x18 *3 ),D_ALL ); +MMIO_D (_MMIO (0xec408 ),D_ALL ); +MMIO_D (_MMIO (0xec40c ),D_ALL ); +MMIO_D (_MMIO (0xec408 +0x18 ),D_ALL ); +MMIO_D (_MMIO (0xec40c +0x18 ),D_ALL ); +MMIO_D (_MMIO (0xec408 +0x18 *2 ),D_ALL ); +MMIO_D (_MMIO (0xec40c +0x18 *2 ),D_ALL ); +MMIO_D (_MMIO (0xec408 +0x18 *3 ),D_ALL ); +MMIO_D (_MMIO (0xec40c +0x18 *3 ),D_ALL ); +MMIO_D (_MMIO (0xfc810 ),D_ALL ); +MMIO_D (_MMIO (0xfc81c ),D_ALL ); +MMIO_D (_MMIO (0xfc828 ),D_ALL ); +MMIO_D (_MMIO (0xfc834 ),D_ALL ); +MMIO_D (_MMIO (0xfcc00 ),D_ALL ); +MMIO_D (_MMIO (0xfcc0c ),D_ALL ); +MMIO_D (_MMIO (0xfcc18 ),D_ALL ); +MMIO_D (_MMIO (0xfcc24 ),D_ALL ); +MMIO_D (_MMIO (0xfd000 ),D_ALL ); +MMIO_D (_MMIO (0xfd00c ),D_ALL ); +MMIO_D (_MMIO (0xfd018 ),D_ALL ); +MMIO_D (_MMIO (0xfd024 ),D_ALL ); +MMIO_D (_MMIO (0xfd034 ),D_ALL ); +MMIO_D (FPGA_DBG ,D_ALL ); +MMIO_D (_MMIO (0x2054 ),D_ALL ); +MMIO_D (_MMIO (0x12054 ),D_ALL ); +MMIO_D (_MMIO (0x22054 ),D_ALL ); +MMIO_D (_MMIO (0x1a054 ),D_ALL ); +MMIO_D (_MMIO (0x44070 ),D_ALL ); +MMIO_DF (_MMIO (0x215c ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2178 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x217c ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x12178 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x1217c ),D_ALL ,F_CMD_ACCESS ); +MMIO_F (_MMIO (0x2290 ),8 ,F_CMD_ACCESS ,0 ,0 ,D_BDW_PLUS ); +MMIO_D (_MMIO (0x2b00 ),D_BDW_PLUS ); +MMIO_D (_MMIO (0x2360 ),D_BDW_PLUS ); +MMIO_F (_MMIO (0x5200 ),32 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x5240 ),32 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (_MMIO (0x5280 ),16 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_DF (_MMIO (0x1c17c ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x1c178 ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (BCS_SWCTRL ,D_ALL ,F_CMD_ACCESS ); +MMIO_F (HS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (DS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (IA_VERTICES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (IA_PRIMITIVES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (VS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (GS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (GS_PRIMITIVES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (CL_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (CL_PRIMITIVES_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (PS_INVOCATION_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_F (PS_DEPTH_COUNT ,8 ,F_CMD_ACCESS ,0 ,0 ,D_ALL ); +MMIO_D (_MMIO (0x4260 ),D_BDW_PLUS ); +MMIO_D (_MMIO (0x4264 ),D_BDW_PLUS ); +MMIO_D (_MMIO (0x4268 ),D_BDW_PLUS ); +MMIO_D (_MMIO (0x426c ),D_BDW_PLUS ); +MMIO_D (_MMIO (0x4270 ),D_BDW_PLUS ); +MMIO_DF (_MMIO (0x4094 ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (ARB_MODE ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ); +MMIO_RING_GM (RING_BBADDR ,D_ALL ); +MMIO_DF (_MMIO (0x2220 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x12220 ),D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x22220 ),D_ALL ,F_CMD_ACCESS ); +MMIO_RING_DF (RING_SYNC_1 ,D_ALL ,F_CMD_ACCESS ); +MMIO_RING_DF (RING_SYNC_0 ,D_ALL ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x22178 ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x1a178 ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x1a17c ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_DF (_MMIO (0x2217c ),D_BDW_PLUS ,F_CMD_ACCESS ); +MMIO_D (EDP_PSR_IMR ,D_BDW_PLUS ); +MMIO_D (EDP_PSR_IIR ,D_BDW_PLUS ); +MMIO_D (GUC_STATUS ,D_ALL ); + +return 0 ; +} + +static int iterate_bdw_mmio (struct intel_gvt_mmio_table_iter *iter) +{ +struct drm_i915_private *dev_priv = iter->i915; +int ret; + +MMIO_D (GEN8_GT_IMR (0 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IER (0 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IIR (0 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_ISR (0 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IMR (1 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IER (1 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IIR (1 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_ISR (1 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IMR (2 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IER (2 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IIR (2 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_ISR (2 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IMR (3 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IER (3 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_IIR (3 ),D_BDW_PLUS ); +MMIO_D (GEN8_GT_ISR (3 ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IMR (PIPE_A ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IER (PIPE_A ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IIR (PIPE_A ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_ISR (PIPE_A ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IMR (PIPE_B ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IER (PIPE_B ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IIR (PIPE_B ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_ISR (PIPE_B ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IMR (PIPE_C ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IER (PIPE_C ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_IIR (PIPE_C ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PIPE_ISR (PIPE_C ),D_BDW_PLUS ); +MMIO_D (GEN8_DE_PORT_IMR ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_PORT_IER ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_PORT_IIR ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_PORT_ISR ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_MISC_IMR ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_MISC_IER ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_MISC_IIR ,D_BDW_PLUS ); +MMIO_D (GEN8_DE_MISC_ISR ,D_BDW_PLUS ); +MMIO_D (GEN8_PCU_IMR ,D_BDW_PLUS ); +MMIO_D (GEN8_PCU_IER ,D_BDW_PLUS ); +MMIO_D (GEN8_PCU_IIR ,D_BDW_PLUS ); +MMIO_D (GEN8_PCU_ISR ,D_BDW_PLUS ); +MMIO_D (GEN8_MASTER_IRQ ,D_BDW_PLUS ); +MMIO_RING_D (RING_ACTHD_UDW ,D_BDW_PLUS ); + +#define RING_REG (base) _MMIO((base) + 0xd0) +MMIO_RING_F (RING_REG ,4 ,F_RO ,0 , + ~_MASKED_BIT_ENABLE (RESET_CTL_REQUEST_RESET ),D_BDW_PLUS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x230) +MMIO_RING_D (RING_REG ,D_BDW_PLUS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x234) +MMIO_RING_F (RING_REG ,8 ,F_RO ,0 , ~0 ,D_BDW_PLUS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x244) +MMIO_RING_DF (RING_REG ,D_BDW_PLUS ,F_CMD_ACCESS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x370) +MMIO_RING_F (RING_REG ,48 ,F_RO ,0 , ~0 ,D_BDW_PLUS ); +#undef RING_REG + +#define RING_REG (base) _MMIO((base) + 0x3a0)Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/gvt/mmio_table.h new file +58
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
---end quoted text---
Part of the diff is not shown here. View the raw message.
Quoted 2 lines · Zhi A
1) About having the
mmio_table.h, I would like to keep the stuff in a dedicated header as putting them inintel_gvt.hmight needs i915 guys to maintain it.
2) The other one is about if we should move themmio_table.cinto i915 folder. I guess we need the some comments from Jani. In the current version that I am testing, it's still in GVT folder. Guess we can submit a patch to move it to i915 folder later if Jani is ok about that.
Yes, let's have Jani chime in on these. They're basically one and the same issue. This code will have to be built into into the core i915 driver even with my planned split, which is kindof the point of this exercise. I think it makes sense to use the subdirectories as boundaries for where the code ends up and not to declarare maintainership boundaries, but it will be up to the i915 and gvt maintainers to decide that.
Jani Nikula
maintainerQuoted 10 lines · Christoph Hellwig
Quoted 8 lines · Zhi A
1) About having the
mmio_table.h, I would like to keep the stuff in a dedicated header as putting them inintel_gvt.hmight needs i915 guys to maintain it.
2) The other one is about if we should move themmio_table.cinto i915 folder. I guess we need the some comments from Jani. In the current version that I am testing, it's still in GVT folder. Guess we can submit a patch to move it to i915 folder later if Jani is ok about that.
Quoted 6 lines
Yes, let's have Jani chime in on these. They're basically one and the same issue. This code will have to be built into into the core i915 driver even with my planned split, which is kindof the point of this exercise. I think it makes sense to use the subdirectories as boundaries for where the code ends up and not to declarare maintainership boundaries, but it will be up to the i915 and gvt maintainers to decide that.
Agreed. If there's going to be a gvt.ko, I think all of gvt/ should be part of that module, nothing more, nothing less.
The gvt related files in i915/ should probably be named intel_gvt* or something, ditto for function naming, and we'll probably want patches touching them be Cc'd to intel-gfx list.
Joonas, Rodrigo, Tvrtko, thoughts?
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Zhi Wang
reviewerQuoted 19 lines · Jani Nikula
Quoted 9 lines · Christoph Hellwig
Quoted 8 lines · Zhi A
1) About having the
mmio_table.h, I would like to keep the stuff in a dedicated header as putting them inintel_gvt.hmight needs i915 guys to maintain it.
2) The other one is about if we should move themmio_table.cinto i915 folder. I guess we need the some comments from Jani. In the current version that I am testing, it's still in GVT folder. Guess we can submit a patch to move it to i915 folder later if Jani is ok about that.Quoted 6 lines
Yes, let's have Jani chime in on these. They're basically one and the same issue. This code will have to be built into into the core i915 driver even with my planned split, which is kindof the point of this exercise. I think it makes sense to use the subdirectories as boundaries for where the code ends up and not to declarare maintainership boundaries, but it will be up to the i915 and gvt maintainers to decide that.
Agreed. If there's going to be a gvt.ko, I think all of gvt/ should be part of that module, nothing more, nothing less.
Quoted 8 lines
The gvt related files in i915/ should probably be named intel_gvt* or something, ditto for function naming, and we'll probably want patches touching them be Cc'd to intel-gfx list.
Joonas, Rodrigo, Tvrtko, thoughts?
BR,
Jani.
Hi Christoph and Jani:
Thanks for the comments. It would be nice that people can achieve a agreement. I am OK with both of the options and also moving some files into different folders doesn't needs me to do the full test run again. :)
Thanks,
Zhi.
Quoted 5 lines · Zhi Wang
Hi Christoph and Jani:
Thanks for the comments. It would be nice that people can achieve a agreement. I am OK with both of the options and also moving some files into different folders doesn't needs me to do the full test run again. :)
The way I understood Jani he agrees that the mmio table, which needs to be part of the core i915 module should not be under the gvt/ subdiretory. I.e. it could be drivers/gpu/drm/i915/intel_gvt_mmio_table.c. The declarations could then go either into drivers/gpu/drm/i915/intel_gvt.h or drivers/gpu/drm/i915/intel_gvt_mmio_table.h.
Jani Nikula
maintainerQuoted 7 lines · Christoph Hellwig
Quoted 5 lines · Zhi Wang
Hi Christoph and Jani:
Thanks for the comments. It would be nice that people can achieve a agreement. I am OK with both of the options and also moving some files into different folders doesn't needs me to do the full test run again. :)
Quoted 5 lines
The way I understood Jani he agrees that the mmio table, which needs to be part of the core i915 module should not be under the gvt/ subdiretory. I.e. it could be
drivers/gpu/drm/i915/intel_gvt_mmio_table.c. The declarations could then go either intodrivers/gpu/drm/i915/intel_gvt.hordrivers/gpu/drm/i915/intel_gvt_mmio_table.h.
Correct.
Generally I prefer to have the declarations for stuff in intel_foo.c to be placed in intel_foo.h, and named intel_foo_*.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Joonas Lahtinen
maintainerQuoting Jani Nikula (2022-02-07 12:48:08)
Quoted 18 lines · Christoph Hellwig
Quoted 10 lines · Zhi A
Quoted 8 lines
1) About having the
mmio_table.h, I would like to keep the stuff in a dedicated header as putting them inintel_gvt.hmight needs i915 guys to maintain it.
2) The other one is about if we should move themmio_table.cinto i915 folder. I guess we need the some comments from Jani. In the current version that I am testing, it's still in GVT folder. Guess we can submit a patch to move it to i915 folder later if Jani is ok about that.Quoted 6 lines
Yes, let's have Jani chime in on these. They're basically one and the same issue. This code will have to be built into into the core i915 driver even with my planned split, which is kindof the point of this exercise. I think it makes sense to use the subdirectories as boundaries for where the code ends up and not to declarare maintainership boundaries, but it will be up to the i915 and gvt maintainers to decide that.
Quoted 8 lines
Agreed. If there's going to be a gvt.ko, I think all of gvt/ should be part of that module, nothing more, nothing less.
The gvt related files in i915/ should probably be named intel_gvt* or something, ditto for function naming, and we'll probably want patches touching them be Cc'd to intel-gfx list.
Joonas, Rodrigo, Tvrtko, thoughts?
Agreed on above. I don't think we expect much changes on the golden MMIO state capture set.
Regards, Joonas
kernel test robot
build botI love your patch! Perhaps something to improve:
Hi Zhi,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
[also build test WARNING on next-20220207]
[cannot apply to drm-intel/for-linux-next hch-configfs/for-next v5.17-rc3] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Zhi-Wang/i915-gvt-Introduce-the-mmio_table-c-to-support-VFIO-new-mdev-API/20220127-200727 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: x86_64-rhel-8.3-kselftests (https://download.01.org/0day-ci/archive/20220207/202202072226.kzm2Qm5q-lkp(a)intel.com/config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.4-dirty # https://github.com/0day-ci/linux/commit/533f92651a7a56481a053f1e04dc5a5ec024ffb9 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Zhi-Wang/i915-gvt-Introduce-the-mmio_table-c-to-support-VFIO-new-mdev-API/20220127-200727 git checkout 533f92651a7a56481a053f1e04dc5a5ec024ffb9 # save the config file to linux build tree mkdir build_dir make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/gvt/handlers.c:45:6: sparse: sparse: symbol 'intel_gvt_match_device' was not declared. Should it be static?
vim +/intel_gvt_match_device +45 drivers/gpu/drm/i915/gvt/handlers.c
12d14cc43b3470 Zhi Wang 2016-08-30 44
12d14cc43b3470 Zhi Wang 2016-08-30 @45 bool intel_gvt_match_device(struct intel_gvt *gvt,
12d14cc43b3470 Zhi Wang 2016-08-30 46 unsigned long device)
12d14cc43b3470 Zhi Wang 2016-08-30 47 {
533f92651a7a56 Zhi Wang 2022-01-27 48 return intel_gvt_get_device_type(gvt->gt->i915) & device;
12d14cc43b3470 Zhi Wang 2016-08-30 49 }12d14cc43b3470 Zhi Wang 2016-08-30 50
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botI love your patch! Perhaps something to improve:
Hi Zhi,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
[also build test WARNING on next-20220208]
[cannot apply to drm-intel/for-linux-next v5.17-rc3]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Zhi-Wang/i915-gvt-Introduce-the-mmio_table-c-to-support-VFIO-new-mdev-API/20220127-200727 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: x86_64-rhel-8.3-kselftests (https://download.01.org/0day-ci/archive/20220208/202202082210.BpzSju31-lkp(a)intel.com/config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.4-dirty # https://github.com/0day-ci/linux/commit/533f92651a7a56481a053f1e04dc5a5ec024ffb9 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Zhi-Wang/i915-gvt-Introduce-the-mmio_table-c-to-support-VFIO-new-mdev-API/20220127-200727 git checkout 533f92651a7a56481a053f1e04dc5a5ec024ffb9 # save the config file to linux build tree mkdir build_dir make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/gvt/handlers.c:45:6: sparse: sparse: symbol 'intel_gvt_match_device' was not declared. Should it be static?
vim +/intel_gvt_match_device +45 drivers/gpu/drm/i915/gvt/handlers.c
12d14cc43b3470 Zhi Wang 2016-08-30 44
12d14cc43b3470 Zhi Wang 2016-08-30 @45 bool intel_gvt_match_device(struct intel_gvt *gvt,
12d14cc43b3470 Zhi Wang 2016-08-30 46 unsigned long device)
12d14cc43b3470 Zhi Wang 2016-08-30 47 {
533f92651a7a56 Zhi Wang 2022-01-27 48 return intel_gvt_get_device_type(gvt->gt->i915) & device;
12d14cc43b3470 Zhi Wang 2016-08-30 49 }12d14cc43b3470 Zhi Wang 2016-08-30 50
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org