From 59ec420bb20820925a4b5811b64705d1e068c4e9 Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 31 Jan 2022 06:00:48 +0000 Subject: [PATCH] define CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND to reduce diff to linux --- sys/dev/pci/drm/i915/gem/i915_gem_mman.c | 2 -- sys/dev/pci/drm/include/generated/autoconf.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/pci/drm/i915/gem/i915_gem_mman.c b/sys/dev/pci/drm/i915/gem/i915_gem_mman.c index 14daad18e21..2607a4fde21 100644 --- a/sys/dev/pci/drm/i915/gem/i915_gem_mman.c +++ b/sys/dev/pci/drm/i915/gem/i915_gem_mman.c @@ -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)); diff --git a/sys/dev/pci/drm/include/generated/autoconf.h b/sys/dev/pci/drm/include/generated/autoconf.h index 7ef084966ec..51e806128bb 100644 --- a/sys/dev/pci/drm/include/generated/autoconf.h +++ b/sys/dev/pci/drm/include/generated/autoconf.h @@ -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 -- 2.20.1