diff options
| author |   jsg <jsg@openbsd.org> | 2020-06-19 09:17:51 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-06-19 09:17:51 +0000 |
| commit | 1cf3647954f45deaa7c593886578039581249d21 (patch) | |
| tree | ecde3c8a379a6bdd999c91c58e10de1d5da2daf2 | |
| parent | stoeplitz_to_key takes a void * now. (diff) | |
| download | wireguard-openbsd-1cf3647954f45deaa7c593886578039581249d21.tar.xz wireguard-openbsd-1cf3647954f45deaa7c593886578039581249d21.zip | |
reduce the diff to linux
| -rw-r--r-- | sys/dev/pci/drm/drm_fb_helper.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/include/generated/autoconf.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/drm_fb_helper.c b/sys/dev/pci/drm/drm_fb_helper.c index 7f161ffe594..c744d0b67c4 100644 --- a/sys/dev/pci/drm/drm_fb_helper.c +++ b/sys/dev/pci/drm/drm_fb_helper.c @@ -54,15 +54,11 @@ module_param_named(fbdev_emulation, drm_fbdev_emulation, bool, 0600); MODULE_PARM_DESC(fbdev_emulation, "Enable legacy fbdev emulation [default=true]"); -#ifdef __linux__ static int drm_fbdev_overalloc = CONFIG_DRM_FBDEV_OVERALLOC; module_param(drm_fbdev_overalloc, int, 0444); MODULE_PARM_DESC(drm_fbdev_overalloc, "Overallocation of the fbdev buffer (%) [default=" __MODULE_STRING(CONFIG_DRM_FBDEV_OVERALLOC) "]"); -#else -static int drm_fbdev_overalloc = 100; -#endif /* * In order to keep user-space compatibility, we want in certain use-cases diff --git a/sys/dev/pci/drm/include/generated/autoconf.h b/sys/dev/pci/drm/include/generated/autoconf.h index 078a9b42e9c..58b9776ac6d 100644 --- a/sys/dev/pci/drm/include/generated/autoconf.h +++ b/sys/dev/pci/drm/include/generated/autoconf.h @@ -15,6 +15,8 @@ #define CONFIG_DRM_AMDGPU_SI 1 #endif +#define CONFIG_DRM_FBDEV_OVERALLOC 100 + #define CONFIG_DRM_I915_PREEMPT_TIMEOUT 640 /* ms */ #define CONFIG_DRM_I915_TIMESLICE_DURATION 1 /* ms */ #define CONFIG_DRM_I915_HEARTBEAT_INTERVAL 2500 /* ms */ |