[PULL] drm-intel-fixes

Commit Message

Rodrigo Vivi July 13, 2018, 7:09 a.m. UTC

Hi Dave,

Things are still calm, but I'd like to add the GVT fix to this week
pull for 4.18.

Here goes drm-intel-fixes-2018-07-12:
- GVT fix for KBL vGPU hang to update virtual register from LRI.
- Fix hotplug irq ack on i965/g4x (Ville)

There's a silent conflict with gvt-fixes and gvt-next, which I'm
sending soon to you as well.

I'm not sure this will hit you now or later, but anyways in summary here
the issue is a compilation error
drivers/gpu/drm/i915/gvt/kvmgt.c:188:17: error: 'pfn' undeclared

And the solution Acked-by: Zhenyu Wang is:

The following changes since commit 1e4b044d22517cae7047c99038abb444423243ca:

  Linux 4.18-rc4 (2018-07-08 16:34:02 -0700)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2018-07-12

for you to fetch changes up to 09d2da310d61c4bfae33ea05b88e7a8f31350d9e:

  Merge tag 'gvt-fixes-2018-07-11' of https://github.com/intel/gvt-linux into drm-intel-fixes (2018-07-12 00:15:53 -0700)

----------------------------------------------------------------
- GVT fix for KBL vGPU hang to update virtual register from LRI.
- Fix hotplug irq ack on i965/g4x (Ville)

----------------------------------------------------------------
Hang Yuan (1):
      drm/i915/gvt: update vreg on inhibit context lri command

Rodrigo Vivi (1):
      Merge tag 'gvt-fixes-2018-07-11' of https://github.com/intel/gvt-linux into drm-intel-fixes

Ville Syrjälä (1):
      drm/i915: Fix hotplug irq ack on i965/g4x

 drivers/gpu/drm/i915/gvt/cmd_parser.c   | 23 +++++++++++++++++++++++
 drivers/gpu/drm/i915/gvt/gvt.h          | 29 +++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/gvt/handlers.c     | 24 ++++++++++++++++++++++++
 drivers/gpu/drm/i915/gvt/mmio.h         |  2 ++
 drivers/gpu/drm/i915/gvt/mmio_context.c |  4 +++-
 drivers/gpu/drm/i915/i915_irq.c         | 32 ++++++++++++++++++++++++++++++--
 6 files changed, 111 insertions(+), 3 deletions(-)

Patch

--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -185,12 +185,6 @@  static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
        if (ret)
                return ret;

-       if (!pfn_valid(pfn)) {
-               gvt_vgpu_err("pfn 0x%lx is not mem backed\n", pfn);
-               vfio_unpin_pages(mdev_dev(vgpu->vdev.mdev), &gfn, 1);
-               return -EINVAL;
-       }

Thanks,
Rodrigo.