Create devcontainer.json

.devcontainer/devcontainer.json

@@ -0,0 +1,5 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "features": {
+  }
+}

Makefile

@@ -3,7 +3,7 @@
 SYSDIR?=/usr/src/sys
 .include "${SYSDIR}/conf/kern.opts.mk"
 
-_VALID_KMODS=	dmabuf linuxkpi ttm drm dummygfx i915 amd radeon
+_VALID_KMODS=	dmabuf linuxkpi ttm drm dummygfx i915 amd radeon vmwgfx
 
 SUPPORTED_ARCH=	amd64 \
 		i386 \
@@ -22,10 +22,11 @@ DEFAULT_KMODS=	dmabuf		\
 		ttm		\
 		drm		\
 		amd		\
-		radeon
+		radeon          \
+                i915
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
-DEFAULT_KMODS+=	i915
+#DEFAULT_KMODS+=	vmwgfx
 .endif
 
 .if defined(DUMMYGFX)

drivers/gpu/drm/i915/gem/i915_gem_pages.c

@@ -167,6 +167,7 @@ static void unmap_object(struct drm_i915_gem_object *obj, void *ptr)
 {
 	if (is_vmalloc_addr(ptr))
 		vunmap(ptr);
+	// BSDFIXME: kunmap removed due to a backport from 5.10
 }
 
 struct sg_table *
@@ -237,6 +238,7 @@ int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj)
 	return err;
 }
 
+// BSDFIXME: i915_gem_object_map_page is a backport from 5.10
 /* The 'mapping' part of i915_gem_object_pin_map() below */
 static void *i915_gem_object_map_page(struct drm_i915_gem_object *obj,
 		enum i915_map_type type)
@@ -294,6 +296,7 @@ static void *i915_gem_object_map_page(struct drm_i915_gem_object *obj,
 	return vaddr;
 }
 
+// BSDFIXME: i915_gem_object_map_pfn is a backport from 5.10
 static void *i915_gem_object_map_pfn(struct drm_i915_gem_object *obj,
 		enum i915_map_type type)
 {
@@ -379,6 +382,7 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj,
 	}
 
 	if (!ptr) {
+		// BSDFIXME: Following 7 lines are a backport from 5.10
 		if (GEM_WARN_ON(type == I915_MAP_WC &&
 				!static_cpu_has(X86_FEATURE_PAT)))
 			ptr = NULL;

drivers/gpu/drm/i915/i915_params.h

@@ -84,7 +84,7 @@ struct drm_printer;
 	param(bool, verbose_state_checks, true, 0) \
 	param(bool, nuclear_pageflip, false, 0400) \
 	param(bool, enable_dp_mst, true, 0600) \
-	param(bool, enable_gvt, false, 0400)
+	param(bool, enable_gvt, true, 0400)
 
 #define MEMBER(T, member, ...) T member;
 struct i915_params {

drivers/gpu/drm/i915/i915_vgpu.c

@@ -61,7 +61,6 @@
  */
 void intel_vgpu_detect(struct drm_i915_private *dev_priv)
 {
-#ifdef __linux__
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	u64 magic;
 	u16 version_major;
@@ -103,7 +102,6 @@ void intel_vgpu_detect(struct drm_i915_private *dev_priv)
 
 out:
 	pci_iounmap(pdev, shared_area);
-#endif
 }
 
 void intel_vgpu_register(struct drm_i915_private *i915)

drivers/gpu/drm/linux_fb.c

@@ -309,3 +309,41 @@ linux_fb_get_options(const char *connector_name, char **option)
 
 	return (*option != NULL ? 0 : -ENOENT);
 }
+
+void
+cfb_fillrect(struct linux_fb_info *p, const struct fb_fillrect *rect)
+{
+	tainted_cfb_fillrect(p, rect);
+}
+
+void
+cfb_copyarea(struct linux_fb_info *p, const struct fb_copyarea *area)
+{
+
+	tainted_cfb_copyarea(p, area);
+}
+
+void
+cfb_imageblit(struct linux_fb_info *p, const struct fb_image *image)
+{
+	tainted_cfb_imageblit(p, image);
+}
+
+void
+sys_fillrect(struct linux_fb_info *p, const struct fb_fillrect *rect)
+{
+	tainted_cfb_fillrect(p, rect);
+}
+
+void
+sys_copyarea(struct linux_fb_info *p, const struct fb_copyarea *area)
+{
+
+	tainted_cfb_copyarea(p, area);
+}
+
+void
+sys_imageblit(struct linux_fb_info *p, const struct fb_image *image)
+{
+	tainted_cfb_imageblit(p, image);
+}