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

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / Kconfig

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 7769e469118f2084f4ee84b70f7aa049cd07239c..df96aed6975a8caa613156839e98b1bde8c6349c 100644 (file)
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -11,6 +11,7 @@ config DRM_I915
        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
@@ -24,16 +25,17 @@ config DRM_I915
          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
@@ -46,6 +48,31 @@ config DRM_I915_PRELIMINARY_HW_SUPPORT
 
          If in doubt, say "N".
 
+config DRM_I915_CAPTURE_ERROR
+       bool "Enable capturing GPU state following a hang"
+       depends on DRM_I915
+       default y
+       help
+         This option enables capturing the GPU state when a hang is detected.
+         This information is vital for triaging hangs and assists in debugging.
+         Please report any hang to
+            https://bugs.freedesktop.org/enter_bug.cgi?product=DRI
+         for triaging.
+
+         If in doubt, say "Y".
+
+config DRM_I915_COMPRESS_ERROR
+       bool "Compress GPU error state"
+       depends on DRM_I915_CAPTURE_ERROR
+       select ZLIB_DEFLATE
+       default y
+       help
+         This option selects ZLIB_DEFLATE if it isn't already
+         selected and causes any error state captured upon a GPU hang
+         to be compressed using zlib.
+
+         If in doubt, say "Y".
+
 config DRM_I915_USERPTR
        bool "Always enable userptr support"
        depends on DRM_I915
@@ -60,6 +87,7 @@ config DRM_I915_USERPTR
 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