Merge tag 'gvt-next-2016-10-27' of https://github.com/01org/gvt-linux into drm-intel...

gvt-next-2016-10-27

- Resolve current left build issue with ACPI=n and 32bit kernel
- TLB workaround from Arkadiusz
- vGPU reset fix from Ping
- workload scheduler nesting sleep fix from Changbin
- more misc fixes for sparse warnings and cleanups

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

diff --combined drivers/gpu/drm/i915/Kconfig
index af13c624de9dda3391b839d3f33ef650f5490934,c72b007c2048dfb9e3a4290aca1a6240468b64e6..df96aed6975a8caa613156839e98b1bde8c6349c
--- 1/drivers/gpu/drm/i915/Kconfig
--- 2/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@@ -4,6 -4,7 +4,6 @@@ config DRM_I91
        depends on X86 && PCI
        select INTEL_GTT
        select INTERVAL_TREE
 -      select STOP_MACHINE
        # we need shmfs for the swappable backing store, and in particular
        # the shmem_readpage() which depends upon tmpfs
        select SHMEM
@@@ -11,7 -12,6 +11,7 @@@
        select DRM_KMS_HELPER
        select DRM_PANEL
        select DRM_MIPI_DSI
 +      select RELAY
        # i915 depends on ACPI_VIDEO when ACPI is enabled
        # but for select to work, need to select ACPI_VIDEO's dependencies, ick
        select BACKLIGHT_LCD_SUPPORT if ACPI
@@@ -25,17 -25,16 +25,17 @@@
          including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,
          G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,
          Core i5, Core i7 as well as Atom CPUs with integrated graphics.
 -        If M is selected, the module will be called i915.  AGP support
 -        is required for this driver to work. This driver is used by
 -        the Intel driver in X.org 6.8 and XFree86 4.4 and above. It
 -        replaces the older i830 module that supported a subset of the
 -        hardware in older X.org releases.
 +
 +        This driver is used by the Intel driver in X.org 6.8 and
 +        XFree86 4.4 and above. It replaces the older i830 module that
 +        supported a subset of the hardware in older X.org releases.
  
          Note that the older i810/i815 chipsets require the use of the
          i810 driver instead, and the Atom z5xx series has an entirely
          different implementation.
  
 +        If "M" is selected, the module will be called i915.
 +
  config DRM_I915_PRELIMINARY_HW_SUPPORT
        bool "Enable preliminary support for prerelease Intel hardware by default"
        depends on DRM_I915
@@@ -87,6 -86,7 +87,7 @@@ config DRM_I915_USERPT
  config DRM_I915_GVT
          bool "Enable Intel GVT-g graphics virtualization host support"
          depends on DRM_I915
+         depends on 64BIT
          default n
          help
          Choose this option if you want to enable Intel GVT-g graphics