Commit 9da93fe4 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-intel-fixes-2024-02-08' of...

Merge tag 'drm-intel-fixes-2024-02-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

- Just includes gvt-fixes-2024-02-05
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZcTETgXsejwVwat6@jlahtine-mobl.ger.corp.intel.com
parents 60c16201 a99682e8
...@@ -10801,11 +10801,11 @@ F: drivers/gpio/gpio-tangier.h ...@@ -10801,11 +10801,11 @@ F: drivers/gpio/gpio-tangier.h
INTEL GVT-g DRIVERS (Intel GPU Virtualization) INTEL GVT-g DRIVERS (Intel GPU Virtualization)
M: Zhenyu Wang <zhenyuw@linux.intel.com> M: Zhenyu Wang <zhenyuw@linux.intel.com>
M: Zhi Wang <zhi.a.wang@intel.com> M: Zhi Wang <zhi.wang.linux@gmail.com>
L: intel-gvt-dev@lists.freedesktop.org L: intel-gvt-dev@lists.freedesktop.org
L: intel-gfx@lists.freedesktop.org L: intel-gfx@lists.freedesktop.org
S: Supported S: Supported
W: https://01.org/igvt-g W: https://github.com/intel/gvt-linux/wiki
T: git https://github.com/intel/gvt-linux.git T: git https://github.com/intel/gvt-linux.git
F: drivers/gpu/drm/i915/gvt/ F: drivers/gpu/drm/i915/gvt/
......
...@@ -140,7 +140,7 @@ config DRM_I915_GVT_KVMGT ...@@ -140,7 +140,7 @@ config DRM_I915_GVT_KVMGT
Note that this driver only supports newer device from Broadwell on. Note that this driver only supports newer device from Broadwell on.
For further information and setup guide, you can visit: For further information and setup guide, you can visit:
http://01.org/igvt-g. https://github.com/intel/gvt-linux/wiki.
If in doubt, say "N". If in doubt, say "N".
......
...@@ -2849,8 +2849,7 @@ static int handle_mmio(struct intel_gvt_mmio_table_iter *iter, u32 offset, ...@@ -2849,8 +2849,7 @@ static int handle_mmio(struct intel_gvt_mmio_table_iter *iter, u32 offset,
for (i = start; i < end; i += 4) { for (i = start; i < end; i += 4) {
p = intel_gvt_find_mmio_info(gvt, i); p = intel_gvt_find_mmio_info(gvt, i);
if (p) { if (p) {
WARN(1, "dup mmio definition offset %x\n", WARN(1, "dup mmio definition offset %x\n", i);
info->offset);
/* We return -EEXIST here to make GVT-g load fail. /* We return -EEXIST here to make GVT-g load fail.
* So duplicated MMIO can be found as soon as * So duplicated MMIO can be found as soon as
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
* To virtualize GPU resources GVT-g driver depends on hypervisor technology * To virtualize GPU resources GVT-g driver depends on hypervisor technology
* e.g KVM/VFIO/mdev, Xen, etc. to provide resource access trapping capability * e.g KVM/VFIO/mdev, Xen, etc. to provide resource access trapping capability
* and be virtualized within GVT-g device module. More architectural design * and be virtualized within GVT-g device module. More architectural design
* doc is available on https://01.org/group/2230/documentation-list. * doc is available on https://github.com/intel/gvt-linux/wiki.
*/ */
static LIST_HEAD(intel_gvt_devices); static LIST_HEAD(intel_gvt_devices);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment