]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'gvt-next-2017-12-14' of https://github.com/intel/gvt-linux into drm-intel...
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 14 Dec 2017 18:57:39 +0000 (10:57 -0800)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 14 Dec 2017 18:57:41 +0000 (10:57 -0800)
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
1  2 
drivers/gpu/drm/i915/gvt/Makefile
drivers/gpu/drm/i915/gvt/gvt.h
drivers/gpu/drm/i915/gvt/handlers.c
drivers/gpu/drm/i915/gvt/mmio_context.c

Simple merge
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,4c8e1285c6072241b658f67f9c6cdb3c480b8adc..8a52b56f0e8601d886364c62f5aa66371ba41eb3
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,403 +1,402 @@@
 -                              ((ctx_ctrl & inhibit_mask) != inhibit_mask) &&
 -                              i915_modparams.enable_execlists)
+ /*
+  * Copyright(c) 2011-2016 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.
+  *
+  * Authors:
+  *    Eddie Dong <eddie.dong@intel.com>
+  *    Kevin Tian <kevin.tian@intel.com>
+  *
+  * Contributors:
+  *    Zhi Wang <zhi.a.wang@intel.com>
+  *    Changbin Du <changbin.du@intel.com>
+  *    Zhenyu Wang <zhenyuw@linux.intel.com>
+  *    Tina Zhang <tina.zhang@intel.com>
+  *    Bing Niu <bing.niu@intel.com>
+  *
+  */
+ #include "i915_drv.h"
+ #include "gvt.h"
+ #include "trace.h"
+ /**
+  * 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 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];
+ static u32 gen9_render_mocs_L3[32];
+ static void handle_tlb_pending_event(struct intel_vgpu *vgpu, int ring_id)
+ {
+       struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;
+       struct intel_vgpu_submission *s = &vgpu->submission;
+       enum forcewake_domains fw;
+       i915_reg_t reg;
+       u32 regs[] = {
+               [RCS] = 0x4260,
+               [VCS] = 0x4264,
+               [VCS2] = 0x4268,
+               [BCS] = 0x426c,
+               [VECS] = 0x4270,
+       };
+       if (WARN_ON(ring_id >= ARRAY_SIZE(regs)))
+               return;
+       if (!test_and_clear_bit(ring_id, (void *)s->tlb_handle_pending))
+               return;
+       reg = _MMIO(regs[ring_id]);
+       /* WaForceWakeRenderDuringMmioTLBInvalidate:skl
+        * we need to put a forcewake when invalidating RCS TLB caches,
+        * otherwise device can go to RC6 state and interrupt invalidation
+        * process
+        */
+       fw = intel_uncore_forcewake_for_reg(dev_priv, reg,
+                                           FW_REG_READ | FW_REG_WRITE);
+       if (ring_id == RCS && (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)))
+               fw |= FORCEWAKE_RENDER;
+       intel_uncore_forcewake_get(dev_priv, fw);
+       I915_WRITE_FW(reg, 0x1);
+       if (wait_for_atomic((I915_READ_FW(reg) == 0), 50))
+               gvt_vgpu_err("timeout in invalidate ring (%d) tlb\n", ring_id);
+       else
+               vgpu_vreg(vgpu, regs[ring_id]) = 0;
+       intel_uncore_forcewake_put(dev_priv, fw);
+       gvt_dbg_core("invalidate TLB for ring %d\n", ring_id);
+ }
+ static void load_mocs(struct intel_vgpu *vgpu, int ring_id)
+ {
+       struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;
+       i915_reg_t offset, l3_offset;
+       u32 regs[] = {
+               [RCS] = 0xc800,
+               [VCS] = 0xc900,
+               [VCS2] = 0xca00,
+               [BCS] = 0xcc00,
+               [VECS] = 0xcb00,
+       };
+       int i;
+       if (WARN_ON(ring_id >= ARRAY_SIZE(regs)))
+               return;
+       offset.reg = regs[ring_id];
+       for (i = 0; i < 64; i++) {
+               gen9_render_mocs[ring_id][i] = I915_READ_FW(offset);
+               I915_WRITE_FW(offset, vgpu_vreg(vgpu, offset));
+               offset.reg += 4;
+       }
+       if (ring_id == RCS) {
+               l3_offset.reg = 0xb020;
+               for (i = 0; i < 32; i++) {
+                       gen9_render_mocs_L3[i] = I915_READ_FW(l3_offset);
+                       I915_WRITE_FW(l3_offset, vgpu_vreg(vgpu, l3_offset));
+                       l3_offset.reg += 4;
+               }
+       }
+ }
+ static void restore_mocs(struct intel_vgpu *vgpu, int ring_id)
+ {
+       struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;
+       i915_reg_t offset, l3_offset;
+       u32 regs[] = {
+               [RCS] = 0xc800,
+               [VCS] = 0xc900,
+               [VCS2] = 0xca00,
+               [BCS] = 0xcc00,
+               [VECS] = 0xcb00,
+       };
+       int i;
+       if (WARN_ON(ring_id >= ARRAY_SIZE(regs)))
+               return;
+       offset.reg = regs[ring_id];
+       for (i = 0; i < 64; i++) {
+               vgpu_vreg(vgpu, offset) = I915_READ_FW(offset);
+               I915_WRITE_FW(offset, gen9_render_mocs[ring_id][i]);
+               offset.reg += 4;
+       }
+       if (ring_id == RCS) {
+               l3_offset.reg = 0xb020;
+               for (i = 0; i < 32; i++) {
+                       vgpu_vreg(vgpu, l3_offset) = I915_READ_FW(l3_offset);
+                       I915_WRITE_FW(l3_offset, gen9_render_mocs_L3[i]);
+                       l3_offset.reg += 4;
+               }
+       }
+ }
+ #define CTX_CONTEXT_CONTROL_VAL       0x03
+ /* Switch ring mmio values (context) from host to a vgpu. */
+ static void switch_mmio_to_vgpu(struct intel_vgpu *vgpu, int ring_id)
+ {
+       struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;
+       struct intel_vgpu_submission *s = &vgpu->submission;
+       u32 *reg_state = s->shadow_ctx->engine[ring_id].lrc_reg_state;
+       u32 ctx_ctrl = reg_state[CTX_CONTEXT_CONTROL_VAL];
+       u32 inhibit_mask =
+               _MASKED_BIT_ENABLE(CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT);
+       struct engine_mmio *mmio;
+       u32 v;
+       if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
+               load_mocs(vgpu, ring_id);
+       mmio = vgpu->gvt->engine_mmio_list;
+       while (i915_mmio_reg_offset((mmio++)->reg)) {
+               if (mmio->ring_id != ring_id)
+                       continue;
+               mmio->value = I915_READ_FW(mmio->reg);
+               /*
+                * if it is an inhibit context, load in_context mmio
+                * into HW by mmio write. If it is not, skip this mmio
+                * write.
+                */
+               if (mmio->in_context &&
++                  (ctx_ctrl & inhibit_mask) != inhibit_mask)
+                       continue;
+               if (mmio->mask)
+                       v = vgpu_vreg(vgpu, mmio->reg) | (mmio->mask << 16);
+               else
+                       v = vgpu_vreg(vgpu, mmio->reg);
+               I915_WRITE_FW(mmio->reg, v);
+               trace_render_mmio(vgpu->id, "load",
+                                 i915_mmio_reg_offset(mmio->reg),
+                                 mmio->value, v);
+       }
+       handle_tlb_pending_event(vgpu, ring_id);
+ }
+ /* Switch ring mmio values (context) from vgpu to host. */
+ static void switch_mmio_to_host(struct intel_vgpu *vgpu, int ring_id)
+ {
+       struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;
+       struct engine_mmio *mmio;
+       u32 v;
+       if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
+               restore_mocs(vgpu, ring_id);
+       mmio = vgpu->gvt->engine_mmio_list;
+       while (i915_mmio_reg_offset((mmio++)->reg)) {
+               if (mmio->ring_id != ring_id)
+                       continue;
+               vgpu_vreg(vgpu, mmio->reg) = I915_READ_FW(mmio->reg);
+               if (mmio->mask) {
+                       vgpu_vreg(vgpu, mmio->reg) &= ~(mmio->mask << 16);
+                       v = mmio->value | (mmio->mask << 16);
+               } else
+                       v = mmio->value;
+               if (mmio->in_context)
+                       continue;
+               I915_WRITE_FW(mmio->reg, v);
+               trace_render_mmio(vgpu->id, "restore",
+                                 i915_mmio_reg_offset(mmio->reg),
+                                 mmio->value, v);
+       }
+ }
+ /**
+  * intel_gvt_switch_render_mmio - switch mmio context of specific engine
+  * @pre: the last vGPU that own the engine
+  * @next: the vGPU to switch to
+  * @ring_id: specify the engine
+  *
+  * If pre is null indicates that host own the engine. If next is null
+  * indicates that we are switching to host workload.
+  */
+ void intel_gvt_switch_mmio(struct intel_vgpu *pre,
+                          struct intel_vgpu *next, int ring_id)
+ {
+       struct drm_i915_private *dev_priv;
+       if (WARN_ON(!pre && !next))
+               return;
+       gvt_dbg_render("switch ring %d from %s to %s\n", ring_id,
+                      pre ? "vGPU" : "host", next ? "vGPU" : "HOST");
+       dev_priv = pre ? pre->gvt->dev_priv : next->gvt->dev_priv;
+       /**
+        * We are using raw mmio access wrapper to improve the
+        * performace for batch mmio read/write, so we need
+        * handle forcewake mannually.
+        */
+       intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
+       /**
+        * TODO: Optimize for vGPU to vGPU switch by merging
+        * switch_mmio_to_host() and switch_mmio_to_vgpu().
+        */
+       if (pre)
+               switch_mmio_to_host(pre, ring_id);
+       if (next)
+               switch_mmio_to_vgpu(next, ring_id);
+       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;
+ }