define CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND to reduce diff to linux
authorjsg <jsg@openbsd.org>
Mon, 31 Jan 2022 06:00:48 +0000 (06:00 +0000)
committerjsg <jsg@openbsd.org>
Mon, 31 Jan 2022 06:00:48 +0000 (06:00 +0000)
sys/dev/pci/drm/i915/gem/i915_gem_mman.c
sys/dev/pci/drm/include/generated/autoconf.h

index 14daad1..2607a4f 100644 (file)
@@ -737,11 +737,9 @@ retry:
        /* Track the mmo associated with the fenced vma */
        vma->mmo = mmo;
 
-#ifdef notyet
        if (IS_ACTIVE(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND))
                intel_wakeref_auto(&i915->ggtt.userfault_wakeref,
                                   msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND));
-#endif
 
        if (write) {
                GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
index 7ef0849..51e8061 100644 (file)
@@ -26,6 +26,7 @@
 #define CONFIG_DRM_I915_REQUEST_TIMEOUT                20000   /* ms */
 #define CONFIG_DRM_I915_STOP_TIMEOUT           100     /* ms */
 #define CONFIG_DRM_I915_FENCE_TIMEOUT          10000   /* ms */
+#define CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND  250     /* ms */
 #define CONFIG_DRM_I915_FORCE_PROBE            ""
 
 #ifdef __HAVE_ACPI