diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 8675253bf..09f56ccc1 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -1093,7 +1093,10 @@ define KernelPackage/drm-i915 CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS=n \ CONFIG_DRM_I915_USERPTR=y \ CONFIG_DRM_I915_WERROR=n - FILES:=$(LINUX_DIR)/drivers/gpu/drm/i915/i915.ko + FILES:= \ + $(LINUX_DIR)/drivers/gpu/drm/i915/i915.ko \ + $(LINUX_DIR)/drivers/gpu/drm/drm_buddy.ko@ge5.18 \ + $(LINUX_DIR)/drivers/gpu/drm/display/drm_display_helper.ko@ge5.18 AUTOLOAD:=$(call AutoProbe,i915) endef diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk index 0cf7b63c3..faa020b98 100644 --- a/package/kernel/linux/modules/virt.mk +++ b/package/kernel/linux/modules/virt.mk @@ -103,7 +103,9 @@ define KernelPackage/i915-gvt TITLE:=Enable KVM/VFIO support for Intel GVT-g DEPENDS:=@TARGET_x86_64 +kmod-kvm-intel +kmod-drm-i915 +kmod-vfio-mdev KCONFIG:= CONFIG_DRM_I915_GVT_KVMGT - FILES:=$(LINUX_DIR)/drivers/gpu/drm/i915/gvt/kvmgt.ko + FILES:= \ + $(LINUX_DIR)/drivers/gpu/drm/i915/gvt/kvmgt.ko@lt5.18 \ + $(LINUX_DIR)/drivers/gpu/drm/i915/kvmgt.ko@ge5.18 AUTOLOAD:=$(call AutoProbe,kvmgt) endef diff --git a/target/linux/x86/64/config-5.19 b/target/linux/x86/64/config-5.19 index eea57c2fd..563590eb6 100644 --- a/target/linux/x86/64/config-5.19 +++ b/target/linux/x86/64/config-5.19 @@ -128,29 +128,15 @@ CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_GEM_SHMEM_HELPER=y # CONFIG_DRM_HYPERV is not set -CONFIG_DRM_I915=y -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -# CONFIG_DRM_I915_DEBUG is not set -# CONFIG_DRM_I915_DEBUG_GUC is not set -# CONFIG_DRM_I915_DEBUG_MMIO is not set -# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set -# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set -CONFIG_DRM_I915_FENCE_TIMEOUT=10000 CONFIG_DRM_I915_FORCE_PROBE="" -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500 -# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set -CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000 -CONFIG_DRM_I915_PREEMPT_TIMEOUT=640 -# CONFIG_DRM_I915_SELFTEST is not set -CONFIG_DRM_I915_STOP_TIMEOUT=100 -# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set -# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set -CONFIG_DRM_I915_TIMESLICE_DURATION=1 +CONFIG_DRM_I915_REQUEST_TIMEOUT=20000 +CONFIG_DRM_I915_FENCE_TIMEOUT=10000 CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250 -CONFIG_DRM_I915_USERPTR=y -# CONFIG_DRM_I915_WERROR is not set +CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500 +CONFIG_DRM_I915_PREEMPT_TIMEOUT=640 +CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000 +CONFIG_DRM_I915_STOP_TIMEOUT=100 +CONFIG_DRM_I915_TIMESLICE_DURATION=1 CONFIG_DRM_KMS_HELPER=y CONFIG_DRM_MIPI_DSI=y CONFIG_DRM_NOMODESET=y @@ -190,6 +176,7 @@ CONFIG_FB_CMDLINE=y CONFIG_FB_DEFERRED_IO=y CONFIG_FB_EFI=y CONFIG_FB_HYPERV=y +# CONFIG_FB_INTEL is not set CONFIG_FB_MODE_HELPERS=y CONFIG_FB_SIMPLE=y CONFIG_FB_SYS_COPYAREA=y @@ -439,6 +426,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_WRITABLE_TRIPS=y # CONFIG_TOSHIBA_BT_RFKILL is not set +# CONFIG_UACCE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCS2_STRING=y # CONFIG_UNWINDER_ORC is not set