diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2022-01-31 06:00:49 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2022-01-31 06:00:49 +0000 |
| commit | a6146dce014caca7968692b31b8cffbf8bbe5e9f (patch) | |
| tree | d7c6916aaa2ee7b4395b37e2d3df5c8cf8744b8a /sys | |
| parent | 5fad19e7ccfbe415dbe9a9c17ea28990545ecfa4 (diff) | |
define CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND to reduce diff to linux
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/i915/gem/i915_gem_mman.c | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/include/generated/autoconf.h | 1 |
2 files changed, 1 insertions, 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 |