diff options
| author |   Jani Nikula <jani.nikula@intel.com> | 2022-04-25 11:17:52 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2022-04-25 11:20:57 +0300 |
| commit | 1e1d2e185358b9383807ccfc30f51b642ebe3b8a (patch) | |
| tree | 7495114f55e02b9535b3d7136255c944c1986159 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | drm/i915: Check EDID for HDR static metadata when choosing blc (diff) | |
| parent | vfio/mdev: Remove mdev drvdata (diff) | |
| download | linux-dev-1e1d2e185358b9383807ccfc30f51b642ebe3b8a.tar.xz linux-dev-1e1d2e185358b9383807ccfc30f51b642ebe3b8a.zip | |
Merge tag 'gvt-next-2022-04-21-for-christoph' of https://github.com/intel/gvt-linux into drm-intel-next
gvt-next-2022-04-21-for-christoph
- Separating the MMIO table from GVT-g. (Zhi)
- GVT-g re-factor. (Christoph)
- GVT-g mdev API cleanup. (Jason)
- GVT-g trace/makefile cleanup. (Jani)
[Jani: added #include to adapt to header refactoring in drm-intel-next]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
From: "Wang, Zhi A" <zhi.a.wang@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/25a713cd-0b7d-4c09-7d91-4f4ef6c9eb11@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 3711d618a372..806d893cac01 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -400,6 +400,9 @@ 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 list_head entry; }; struct i915_selftest_stash { |