Merge tag 'gvt-next-2017-12-14' of https://github.com/intel/gvt-linux into drm-intel-next-queued

gvt-next-2017-12-14:

- fixes for two coverity scan errors (Colin)
- mmio switch code refine (Changbin)
- more virtual display dmabuf fixes (Tina/Gustavo)
- misc cleanups (Pei)

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171214033434.jlppjlyal5d67ya7@zhen-hp.sh.intel.com

10 files changed, 181 insertions, 167 deletions

diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile
index 883189694eb6..347116faa558 100644
--- a/drivers/gpu/drm/i915/gvt/Makefile
+++ b/drivers/gpu/drm/i915/gvt/Makefile
@@ -2,7 +2,7 @@
 GVT_DIR := gvt
 GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \
         interrupt.o gtt.o cfg_space.o opregion.o mmio.o display.o edid.o \
-        execlist.o scheduler.o sched_policy.o render.o cmd_parser.o debugfs.o \
+        execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \
         fb_decoder.o dmabuf.o
 
 ccflags-y                               += -I$(src) -I$(src)/$(GVT_DIR)
diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.c b/drivers/gpu/drm/i915/gvt/dmabuf.c
index 9c40a67ecdd6..2ab584f97dfb 100644
--- a/drivers/gpu/drm/i915/gvt/dmabuf.c
+++ b/drivers/gpu/drm/i915/gvt/dmabuf.c
@@ -520,19 +520,18 @@ void intel_vgpu_dmabuf_cleanup(struct intel_vgpu *vgpu)
         list_for_each_safe(pos, n, &vgpu->dmabuf_obj_list_head) {
                 dmabuf_obj = container_of(pos, struct intel_vgpu_dmabuf_obj,
                                                 list);
+                dmabuf_obj->vgpu = NULL;
+
+                idr_remove(&vgpu->object_idr, dmabuf_obj->dmabuf_id);
+                intel_gvt_hypervisor_put_vfio_device(vgpu);
+                list_del(pos);
+
+                /* dmabuf_obj might be freed in dmabuf_obj_put */
                 if (dmabuf_obj->initref) {
                         dmabuf_obj->initref = false;
                         dmabuf_obj_put(dmabuf_obj);
                 }
 
-                idr_remove(&vgpu->object_idr, dmabuf_obj->dmabuf_id);
-
-                if (dmabuf_obj->vgpu)
-                        intel_gvt_hypervisor_put_vfio_device(vgpu);
-
-                list_del(pos);
-                dmabuf_obj->vgpu = NULL;
-
         }
         mutex_unlock(&vgpu->dmabuf_lock);
 }
diff --git a/drivers/gpu/drm/i915/gvt/fb_decoder.c b/drivers/gpu/drm/i915/gvt/fb_decoder.c
index 72f42176f35c..6cc99543693f 100644
--- a/drivers/gpu/drm/i915/gvt/fb_decoder.c
+++ b/drivers/gpu/drm/i915/gvt/fb_decoder.c
@@ -222,6 +222,12 @@ int intel_vgpu_decode_primary_plane(struct intel_vgpu *vgpu,
                         val & PLANE_CTL_ORDER_RGBX,
                         val & PLANE_CTL_ALPHA_MASK,
                         val & PLANE_CTL_YUV422_ORDER_MASK);
+
+                if (fmt >= ARRAY_SIZE(skl_pixel_formats)) {
+                        gvt_vgpu_err("Out-of-bounds pixel format index\n");
+                        return -EINVAL;
+                }
+
                 plane->bpp = skl_pixel_formats[fmt].bpp;
                 plane->drm_format = skl_pixel_formats[fmt].drm_format;
         } else {
diff --git a/drivers/gpu/drm/i915/gvt/gvt.c b/drivers/gpu/drm/i915/gvt/gvt.c
index 9a5dce3aa10a..643bb961d40d 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.c
+++ b/drivers/gpu/drm/i915/gvt/gvt.c
@@ -386,6 +386,8 @@ int intel_gvt_init_device(struct drm_i915_private *dev_priv)
         if (ret)
                 goto out_clean_idr;
 
+        intel_gvt_init_engine_mmio_context(gvt);
+
         ret = intel_gvt_load_firmware(gvt);
         if (ret)
                 goto out_clean_mmio_info;
diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 103910a24e4b..1e9f11c8b7bb 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -44,7 +44,7 @@
 #include "execlist.h"
 #include "scheduler.h"
 #include "sched_policy.h"
-#include "render.h"
+#include "mmio_context.h"
 #include "cmd_parser.h"
 #include "fb_decoder.h"
 #include "dmabuf.h"
@@ -310,6 +310,8 @@ struct intel_gvt {
         wait_queue_head_t service_thread_wq;
         unsigned long service_request;
 
+        struct engine_mmio *engine_mmio_list;
+
         struct dentry *debugfs_root;
 };
 
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index 94fc04210bac..c982867e7c2b 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -174,8 +174,10 @@ void enter_failsafe_mode(struct intel_vgpu *vgpu, int reason)
                 break;
         case GVT_FAILSAFE_INSUFFICIENT_RESOURCE:
                 pr_err("Graphics resource is not enough for the guest\n");
+                break;
         case GVT_FAILSAFE_GUEST_ERR:
                 pr_err("GVT Internal error  for the guest\n");
+                break;
         default:
                 break;
         }
@@ -1396,7 +1398,7 @@ static int hws_pga_write(struct intel_vgpu *vgpu, unsigned int offset,
          * update the VM CSB status correctly. Here listed registers can
          * support BDW, SKL or other platforms with same HWSP registers.
          */
-        if (unlikely(ring_id < 0 || ring_id > I915_NUM_ENGINES)) {
+        if (unlikely(ring_id < 0 || ring_id >= I915_NUM_ENGINES)) {
                 gvt_vgpu_err("VM(%d) access unknown hardware status page register:0x%x\n",
                              vgpu->id, offset);
                 return -EINVAL;
@@ -1471,7 +1473,7 @@ static int elsp_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,
         u32 data = *(u32 *)p_data;
         int ret = 0;
 
-        if (WARN_ON(ring_id < 0 || ring_id > I915_NUM_ENGINES - 1))
+        if (WARN_ON(ring_id < 0 || ring_id >= I915_NUM_ENGINES))
                 return -EINVAL;
 
         execlist = &vgpu->submission.execlist[ring_id];
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index b8a85e08091a..f86983d6655b 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -1029,13 +1029,17 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
                 case VFIO_PCI_BAR3_REGION_INDEX ... VFIO_PCI_BAR5_REGION_INDEX:
                         info.offset = VFIO_PCI_INDEX_TO_OFFSET(info.index);
                         info.size = 0;
-
                         info.flags = 0;
+
                         gvt_dbg_core("get region info bar:%d\n", info.index);
                         break;
 
                 case VFIO_PCI_ROM_REGION_INDEX:
                 case VFIO_PCI_VGA_REGION_INDEX:
+                        info.offset = VFIO_PCI_INDEX_TO_OFFSET(info.index);
+                        info.size = 0;
+                        info.flags = 0;
+
                         gvt_dbg_core("get region info index:%d\n", info.index);
                         break;
                 default:
diff --git a/drivers/gpu/drm/i915/gvt/mmio.c b/drivers/gpu/drm/i915/gvt/mmio.c
index 4ea0feb5f04d..f7227a3ad469 100644
--- a/drivers/gpu/drm/i915/gvt/mmio.c
+++ b/drivers/gpu/drm/i915/gvt/mmio.c
@@ -157,7 +157,6 @@ int intel_vgpu_emulate_mmio_read(struct intel_vgpu *vgpu, uint64_t pa,
         unsigned int offset = 0;
         int ret = -EINVAL;
 
-
         if (vgpu->failsafe) {
                 failsafe_emulate_mmio_rw(vgpu, pa, p_data, bytes, true);
                 return 0;
@@ -166,8 +165,7 @@ int intel_vgpu_emulate_mmio_read(struct intel_vgpu *vgpu, uint64_t pa,
 
         if (vgpu_gpa_is_aperture(vgpu, pa)) {
                 ret = vgpu_aperture_rw(vgpu, pa, p_data, bytes, true);
-                mutex_unlock(&gvt->lock);
-                return ret;
+                goto out;
         }
 
         if (atomic_read(&vgpu->gtt.n_tracked_guest_page)) {
@@ -183,8 +181,7 @@ int intel_vgpu_emulate_mmio_read(struct intel_vgpu *vgpu, uint64_t pa,
                                         ret, t->gfn, pa, *(u32 *)p_data,
                                         bytes);
                         }
-                        mutex_unlock(&gvt->lock);
-                        return ret;
+                        goto out;
                 }
         }
 
@@ -205,14 +202,12 @@ int intel_vgpu_emulate_mmio_read(struct intel_vgpu *vgpu, uint64_t pa,
                                 p_data, bytes);
                 if (ret)
                         goto err;
-                mutex_unlock(&gvt->lock);
-                return ret;
+                goto out;
         }
 
         if (WARN_ON_ONCE(!reg_is_mmio(gvt, offset))) {
                 ret = intel_gvt_hypervisor_read_gpa(vgpu, pa, p_data, bytes);
-                mutex_unlock(&gvt->lock);
-                return ret;
+                goto out;
         }
 
         if (WARN_ON(!reg_is_mmio(gvt, offset + bytes - 1)))
@@ -228,11 +223,13 @@ int intel_vgpu_emulate_mmio_read(struct intel_vgpu *vgpu, uint64_t pa,
                 goto err;
 
         intel_gvt_mmio_set_accessed(gvt, offset);
-        mutex_unlock(&gvt->lock);
-        return 0;
+        ret = 0;
+        goto out;
+
 err:
         gvt_vgpu_err("fail to emulate MMIO read %08x len %d\n",
                         offset, bytes);
+out:
         mutex_unlock(&gvt->lock);
         return ret;
 }
@@ -263,8 +260,7 @@ int intel_vgpu_emulate_mmio_write(struct intel_vgpu *vgpu, uint64_t pa,
 
         if (vgpu_gpa_is_aperture(vgpu, pa)) {
                 ret = vgpu_aperture_rw(vgpu, pa, p_data, bytes, false);
-                mutex_unlock(&gvt->lock);
-                return ret;
+                goto out;
         }
 
         if (atomic_read(&vgpu->gtt.n_tracked_guest_page)) {
@@ -280,8 +276,7 @@ int intel_vgpu_emulate_mmio_write(struct intel_vgpu *vgpu, uint64_t pa,
                                         ret, t->gfn, pa,
                                         *(u32 *)p_data, bytes);
                         }
-                        mutex_unlock(&gvt->lock);
-                        return ret;
+                        goto out;
                 }
         }
 
@@ -302,14 +297,12 @@ int intel_vgpu_emulate_mmio_write(struct intel_vgpu *vgpu, uint64_t pa,
                                 p_data, bytes);
                 if (ret)
                         goto err;
-                mutex_unlock(&gvt->lock);
-                return ret;
+                goto out;
         }
 
         if (WARN_ON_ONCE(!reg_is_mmio(gvt, offset))) {
                 ret = intel_gvt_hypervisor_write_gpa(vgpu, pa, p_data, bytes);
-                mutex_unlock(&gvt->lock);
-                return ret;
+                goto out;
         }
 
         ret = intel_vgpu_mmio_reg_rw(vgpu, offset, p_data, bytes, false);
@@ -317,11 +310,12 @@ int intel_vgpu_emulate_mmio_write(struct intel_vgpu *vgpu, uint64_t pa,
                 goto err;
 
         intel_gvt_mmio_set_accessed(gvt, offset);
-        mutex_unlock(&gvt->lock);
-        return 0;
+        ret = 0;
+        goto out;
 err:
         gvt_vgpu_err("fail to emulate MMIO write %08x len %d\n", offset,
                      bytes);
+out:
         mutex_unlock(&gvt->lock);
         return ret;
 }
diff --git a/drivers/gpu/drm/i915/gvt/render.c b/drivers/gpu/drm/i915/gvt/mmio_context.c
index dac12c25f349..8a52b56f0e86 100644
--- a/drivers/gpu/drm/i915/gvt/render.c
+++ b/drivers/gpu/drm/i915/gvt/mmio_context.c
@@ -37,108 +37,116 @@
 #include "gvt.h"
 #include "trace.h"
 
-struct render_mmio {
-        int ring_id;
-        i915_reg_t reg;
-        u32 mask;
-        bool in_context;
-        u32 value;
-};
-
-static struct render_mmio gen8_render_mmio_list[] __cacheline_aligned = {
-        {RCS, _MMIO(0x229c), 0xffff, false},
-        {RCS, _MMIO(0x2248), 0x0, false},
-        {RCS, _MMIO(0x2098), 0x0, false},
-        {RCS, _MMIO(0x20c0), 0xffff, true},
-        {RCS, _MMIO(0x24d0), 0, false},
-        {RCS, _MMIO(0x24d4), 0, false},
-        {RCS, _MMIO(0x24d8), 0, false},
-        {RCS, _MMIO(0x24dc), 0, false},
-        {RCS, _MMIO(0x24e0), 0, false},
-        {RCS, _MMIO(0x24e4), 0, false},
-        {RCS, _MMIO(0x24e8), 0, false},
-        {RCS, _MMIO(0x24ec), 0, false},
-        {RCS, _MMIO(0x24f0), 0, false},
-        {RCS, _MMIO(0x24f4), 0, false},
-        {RCS, _MMIO(0x24f8), 0, false},
-        {RCS, _MMIO(0x24fc), 0, false},
-        {RCS, _MMIO(0x7004), 0xffff, true},
-        {RCS, _MMIO(0x7008), 0xffff, true},
-        {RCS, _MMIO(0x7000), 0xffff, true},
-        {RCS, _MMIO(0x7010), 0xffff, true},
-        {RCS, _MMIO(0x7300), 0xffff, true},
-        {RCS, _MMIO(0x83a4), 0xffff, true},
-
-        {BCS, _MMIO(0x2229c), 0xffff, false},
-        {BCS, _MMIO(0x2209c), 0xffff, false},
-        {BCS, _MMIO(0x220c0), 0xffff, false},
-        {BCS, _MMIO(0x22098), 0x0, false},
-        {BCS, _MMIO(0x22028), 0x0, false},
+/**
+ * Defined in Intel Open Source PRM.
+ * Ref: https://01.org/linuxgraphics/documentation/hardware-specification-prms
+ */
+#define TRVATTL3PTRDW(i)        _MMIO(0x4de0 + (i)*4)
+#define TRNULLDETCT             _MMIO(0x4de8)
+#define TRINVTILEDETCT          _MMIO(0x4dec)
+#define TRVADR                  _MMIO(0x4df0)
+#define TRTTE                   _MMIO(0x4df4)
+#define RING_EXCC(base)         _MMIO((base) + 0x28)
+#define RING_GFX_MODE(base)     _MMIO((base) + 0x29c)
+#define VF_GUARDBAND            _MMIO(0x83a4)
+
+/* Raw offset is appened to each line for convenience. */
+static struct engine_mmio gen8_engine_mmio_list[] __cacheline_aligned = {
+        {RCS, GFX_MODE_GEN7, 0xffff, false}, /* 0x229c */
+        {RCS, GEN9_CTX_PREEMPT_REG, 0x0, false}, /* 0x2248 */
+        {RCS, HWSTAM, 0x0, false}, /* 0x2098 */
+        {RCS, INSTPM, 0xffff, true}, /* 0x20c0 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 0), 0, false}, /* 0x24d0 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 1), 0, false}, /* 0x24d4 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 2), 0, false}, /* 0x24d8 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 3), 0, false}, /* 0x24dc */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 4), 0, false}, /* 0x24e0 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 5), 0, false}, /* 0x24e4 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 6), 0, false}, /* 0x24e8 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 7), 0, false}, /* 0x24ec */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 8), 0, false}, /* 0x24f0 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 9), 0, false}, /* 0x24f4 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 10), 0, false}, /* 0x24f8 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 11), 0, false}, /* 0x24fc */
+        {RCS, CACHE_MODE_1, 0xffff, true}, /* 0x7004 */
+        {RCS, GEN7_GT_MODE, 0xffff, true}, /* 0x7008 */
+        {RCS, CACHE_MODE_0_GEN7, 0xffff, true}, /* 0x7000 */
+        {RCS, GEN7_COMMON_SLICE_CHICKEN1, 0xffff, true}, /* 0x7010 */
+        {RCS, HDC_CHICKEN0, 0xffff, true}, /* 0x7300 */
+        {RCS, VF_GUARDBAND, 0xffff, true}, /* 0x83a4 */
+
+        {BCS, RING_GFX_MODE(BLT_RING_BASE), 0xffff, false}, /* 0x2229c */
+        {BCS, RING_MI_MODE(BLT_RING_BASE), 0xffff, false}, /* 0x2209c */
+        {BCS, RING_INSTPM(BLT_RING_BASE), 0xffff, false}, /* 0x220c0 */
+        {BCS, RING_HWSTAM(BLT_RING_BASE), 0x0, false}, /* 0x22098 */
+        {BCS, RING_EXCC(BLT_RING_BASE), 0x0, false}, /* 0x22028 */
+        { /* Terminated */ }
 };
 
-static struct render_mmio gen9_render_mmio_list[] __cacheline_aligned = {
-        {RCS, _MMIO(0x229c), 0xffff, false},
-        {RCS, _MMIO(0x2248), 0x0, false},
-        {RCS, _MMIO(0x2098), 0x0, false},
-        {RCS, _MMIO(0x20c0), 0xffff, true},
-        {RCS, _MMIO(0x24d0), 0, false},
-        {RCS, _MMIO(0x24d4), 0, false},
-        {RCS, _MMIO(0x24d8), 0, false},
-        {RCS, _MMIO(0x24dc), 0, false},
-        {RCS, _MMIO(0x24e0), 0, false},
-        {RCS, _MMIO(0x24e4), 0, false},
-        {RCS, _MMIO(0x24e8), 0, false},
-        {RCS, _MMIO(0x24ec), 0, false},
-        {RCS, _MMIO(0x24f0), 0, false},
-        {RCS, _MMIO(0x24f4), 0, false},
-        {RCS, _MMIO(0x24f8), 0, false},
-        {RCS, _MMIO(0x24fc), 0, false},
-        {RCS, _MMIO(0x7004), 0xffff, true},
-        {RCS, _MMIO(0x7008), 0xffff, true},
-        {RCS, _MMIO(0x7000), 0xffff, true},
-        {RCS, _MMIO(0x7010), 0xffff, true},
-        {RCS, _MMIO(0x7300), 0xffff, true},
-        {RCS, _MMIO(0x83a4), 0xffff, true},
-
-        {RCS, _MMIO(0x40e0), 0, false},
-        {RCS, _MMIO(0x40e4), 0, false},
-        {RCS, _MMIO(0x2580), 0xffff, true},
-        {RCS, _MMIO(0x7014), 0xffff, true},
-        {RCS, _MMIO(0x20ec), 0xffff, false},
-        {RCS, _MMIO(0xb118), 0, false},
-        {RCS, _MMIO(0xe100), 0xffff, true},
-        {RCS, _MMIO(0xe180), 0xffff, true},
-        {RCS, _MMIO(0xe184), 0xffff, true},
-        {RCS, _MMIO(0xe188), 0xffff, true},
-        {RCS, _MMIO(0xe194), 0xffff, true},
-        {RCS, _MMIO(0x4de0), 0, false},
-        {RCS, _MMIO(0x4de4), 0, false},
-        {RCS, _MMIO(0x4de8), 0, false},
-        {RCS, _MMIO(0x4dec), 0, false},
-        {RCS, _MMIO(0x4df0), 0, false},
-        {RCS, _MMIO(0x4df4), 0, false},
-
-        {BCS, _MMIO(0x2229c), 0xffff, false},
-        {BCS, _MMIO(0x2209c), 0xffff, false},
-        {BCS, _MMIO(0x220c0), 0xffff, false},
-        {BCS, _MMIO(0x22098), 0x0, false},
-        {BCS, _MMIO(0x22028), 0x0, false},
-
-        {VCS2, _MMIO(0x1c028), 0xffff, false},
-
-        {VECS, _MMIO(0x1a028), 0xffff, false},
-
-        {RCS, _MMIO(0x7304), 0xffff, true},
-        {RCS, _MMIO(0x2248), 0x0, false},
-        {RCS, _MMIO(0x940c), 0x0, false},
-        {RCS, _MMIO(0x4ab8), 0x0, false},
-
-        {RCS, _MMIO(0x4ab0), 0x0, false},
-        {RCS, _MMIO(0x20d4), 0x0, false},
-
-        {RCS, _MMIO(0xb004), 0x0, false},
-        {RCS, _MMIO(0x20a0), 0x0, false},
-        {RCS, _MMIO(0x20e4), 0xffff, false},
+static struct engine_mmio gen9_engine_mmio_list[] __cacheline_aligned = {
+        {RCS, GFX_MODE_GEN7, 0xffff, false}, /* 0x229c */
+        {RCS, GEN9_CTX_PREEMPT_REG, 0x0, false}, /* 0x2248 */
+        {RCS, HWSTAM, 0x0, false}, /* 0x2098 */
+        {RCS, INSTPM, 0xffff, true}, /* 0x20c0 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 0), 0, false}, /* 0x24d0 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 1), 0, false}, /* 0x24d4 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 2), 0, false}, /* 0x24d8 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 3), 0, false}, /* 0x24dc */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 4), 0, false}, /* 0x24e0 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 5), 0, false}, /* 0x24e4 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 6), 0, false}, /* 0x24e8 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 7), 0, false}, /* 0x24ec */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 8), 0, false}, /* 0x24f0 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 9), 0, false}, /* 0x24f4 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 10), 0, false}, /* 0x24f8 */
+        {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 11), 0, false}, /* 0x24fc */
+        {RCS, CACHE_MODE_1, 0xffff, true}, /* 0x7004 */
+        {RCS, GEN7_GT_MODE, 0xffff, true}, /* 0x7008 */
+        {RCS, CACHE_MODE_0_GEN7, 0xffff, true}, /* 0x7000 */
+        {RCS, GEN7_COMMON_SLICE_CHICKEN1, 0xffff, true}, /* 0x7010 */
+        {RCS, HDC_CHICKEN0, 0xffff, true}, /* 0x7300 */
+        {RCS, VF_GUARDBAND, 0xffff, true}, /* 0x83a4 */
+
+        {RCS, GEN8_PRIVATE_PAT_LO, 0, false}, /* 0x40e0 */
+        {RCS, GEN8_PRIVATE_PAT_HI, 0, false}, /* 0x40e4 */
+        {RCS, GEN8_CS_CHICKEN1, 0xffff, true}, /* 0x2580 */
+        {RCS, COMMON_SLICE_CHICKEN2, 0xffff, true}, /* 0x7014 */
+        {RCS, GEN9_CS_DEBUG_MODE1, 0xffff, false}, /* 0x20ec */
+        {RCS, GEN8_L3SQCREG4, 0, false}, /* 0xb118 */
+        {RCS, GEN7_HALF_SLICE_CHICKEN1, 0xffff, true}, /* 0xe100 */
+        {RCS, HALF_SLICE_CHICKEN2, 0xffff, true}, /* 0xe180 */
+        {RCS, HALF_SLICE_CHICKEN3, 0xffff, true}, /* 0xe184 */
+        {RCS, GEN9_HALF_SLICE_CHICKEN5, 0xffff, true}, /* 0xe188 */
+        {RCS, GEN9_HALF_SLICE_CHICKEN7, 0xffff, true}, /* 0xe194 */
+        {RCS, TRVATTL3PTRDW(0), 0, false}, /* 0x4de0 */
+        {RCS, TRVATTL3PTRDW(1), 0, false}, /* 0x4de4 */
+        {RCS, TRNULLDETCT, 0, false}, /* 0x4de8 */
+        {RCS, TRINVTILEDETCT, 0, false}, /* 0x4dec */
+        {RCS, TRVADR, 0, false}, /* 0x4df0 */
+        {RCS, TRTTE, 0, false}, /* 0x4df4 */
+
+        {BCS, RING_GFX_MODE(BLT_RING_BASE), 0xffff, false}, /* 0x2229c */
+        {BCS, RING_MI_MODE(BLT_RING_BASE), 0xffff, false}, /* 0x2209c */
+        {BCS, RING_INSTPM(BLT_RING_BASE), 0xffff, false}, /* 0x220c0 */
+        {BCS, RING_HWSTAM(BLT_RING_BASE), 0x0, false}, /* 0x22098 */
+        {BCS, RING_EXCC(BLT_RING_BASE), 0x0, false}, /* 0x22028 */
+
+        {VCS2, RING_EXCC(GEN8_BSD2_RING_BASE), 0xffff, false}, /* 0x1c028 */
+
+        {VECS, RING_EXCC(VEBOX_RING_BASE), 0xffff, false}, /* 0x1a028 */
+
+        {RCS, GEN8_HDC_CHICKEN1, 0xffff, true}, /* 0x7304 */
+        {RCS, GEN9_CTX_PREEMPT_REG, 0x0, false}, /* 0x2248 */
+        {RCS, GEN7_UCGCTL4, 0x0, false}, /* 0x940c */
+        {RCS, GAMT_CHKN_BIT_REG, 0x0, false}, /* 0x4ab8 */
+
+        {RCS, GEN9_GAMT_ECO_REG_RW_IA, 0x0, false}, /* 0x4ab0 */
+        {RCS, GEN9_CSFE_CHICKEN1_RCS, 0x0, false}, /* 0x20d4 */
+
+        {RCS, GEN8_GARBCNTL, 0x0, false}, /* 0xb004 */
+        {RCS, GEN7_FF_THREAD_MODE, 0x0, false}, /* 0x20a0 */
+        {RCS, FF_SLICE_CS_CHICKEN2, 0xffff, false}, /* 0x20e4 */
+        { /* Terminated */ }
 };
 
 static u32 gen9_render_mocs[I915_NUM_ENGINES][64];
@@ -267,22 +275,14 @@ static void switch_mmio_to_vgpu(struct intel_vgpu *vgpu, int ring_id)
         u32 ctx_ctrl = reg_state[CTX_CONTEXT_CONTROL_VAL];
         u32 inhibit_mask =
                 _MASKED_BIT_ENABLE(CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT);
-        i915_reg_t last_reg = _MMIO(0);
-        struct render_mmio *mmio;
+        struct engine_mmio *mmio;
         u32 v;
-        int i, array_size;
 
-        if (IS_SKYLAKE(vgpu->gvt->dev_priv)
-                || IS_KABYLAKE(vgpu->gvt->dev_priv)) {
-                mmio = gen9_render_mmio_list;
-                array_size = ARRAY_SIZE(gen9_render_mmio_list);
+        if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
                 load_mocs(vgpu, ring_id);
-        } else {
-                mmio = gen8_render_mmio_list;
-                array_size = ARRAY_SIZE(gen8_render_mmio_list);
-        }
 
-        for (i = 0; i < array_size; i++, mmio++) {
+        mmio = vgpu->gvt->engine_mmio_list;
+        while (i915_mmio_reg_offset((mmio++)->reg)) {
                 if (mmio->ring_id != ring_id)
                         continue;
 
@@ -303,17 +303,12 @@ static void switch_mmio_to_vgpu(struct intel_vgpu *vgpu, int ring_id)
                         v = vgpu_vreg(vgpu, mmio->reg);
 
                 I915_WRITE_FW(mmio->reg, v);
-                last_reg = mmio->reg;
 
                 trace_render_mmio(vgpu->id, "load",
                                   i915_mmio_reg_offset(mmio->reg),
                                   mmio->value, v);
         }
 
-        /* Make sure the swiched MMIOs has taken effect. */
-        if (likely(INTEL_GVT_MMIO_OFFSET(last_reg)))
-                I915_READ_FW(last_reg);
-
         handle_tlb_pending_event(vgpu, ring_id);
 }
 
@@ -321,21 +316,14 @@ static void switch_mmio_to_vgpu(struct intel_vgpu *vgpu, int ring_id)
 static void switch_mmio_to_host(struct intel_vgpu *vgpu, int ring_id)
 {
         struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;
-        struct render_mmio *mmio;
-        i915_reg_t last_reg = _MMIO(0);
+        struct engine_mmio *mmio;
         u32 v;
-        int i, array_size;
 
-        if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
-                mmio = gen9_render_mmio_list;
-                array_size = ARRAY_SIZE(gen9_render_mmio_list);
+        if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
                 restore_mocs(vgpu, ring_id);
-        } else {
-                mmio = gen8_render_mmio_list;
-                array_size = ARRAY_SIZE(gen8_render_mmio_list);
-        }
 
-        for (i = 0; i < array_size; i++, mmio++) {
+        mmio = vgpu->gvt->engine_mmio_list;
+        while (i915_mmio_reg_offset((mmio++)->reg)) {
                 if (mmio->ring_id != ring_id)
                         continue;
 
@@ -351,16 +339,11 @@ static void switch_mmio_to_host(struct intel_vgpu *vgpu, int ring_id)
                         continue;
 
                 I915_WRITE_FW(mmio->reg, v);
-                last_reg = mmio->reg;
 
                 trace_render_mmio(vgpu->id, "restore",
                                   i915_mmio_reg_offset(mmio->reg),
                                   mmio->value, v);
         }
-
-        /* Make sure the swiched MMIOs has taken effect. */
-        if (likely(INTEL_GVT_MMIO_OFFSET(last_reg)))
-                I915_READ_FW(last_reg);
 }
 
 /**
@@ -404,3 +387,16 @@ void intel_gvt_switch_mmio(struct intel_vgpu *pre,
 
         intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
 }
+
+/**
+ * intel_gvt_init_engine_mmio_context - Initiate the engine mmio list
+ * @gvt: GVT device
+ *
+ */
+void intel_gvt_init_engine_mmio_context(struct intel_gvt *gvt)
+{
+        if (IS_SKYLAKE(gvt->dev_priv) || IS_KABYLAKE(gvt->dev_priv))
+                gvt->engine_mmio_list = gen9_engine_mmio_list;
+        else
+                gvt->engine_mmio_list = gen8_engine_mmio_list;
+}
diff --git a/drivers/gpu/drm/i915/gvt/render.h b/drivers/gpu/drm/i915/gvt/mmio_context.h
index 91db1d39d28f..ca2c6a745673 100644
--- a/drivers/gpu/drm/i915/gvt/render.h
+++ b/drivers/gpu/drm/i915/gvt/mmio_context.h
@@ -36,8 +36,17 @@
 #ifndef __GVT_RENDER_H__
 #define __GVT_RENDER_H__
 
+struct engine_mmio {
+        int ring_id;
+        i915_reg_t reg;
+        u32 mask;
+        bool in_context;
+        u32 value;
+};
+
 void intel_gvt_switch_mmio(struct intel_vgpu *pre,
                            struct intel_vgpu *next, int ring_id);
 
+void intel_gvt_init_engine_mmio_context(struct intel_gvt *gvt);
 
 #endif