Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:27:12 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_client_blt.c
src/sys/external/bsd/drm2/i915drm: files.i915drmkms i915_module.c
Log Message:
drm/i915: Unhook i915_gem_client_blt.c and revert changes.
Only used by self-tests, which we're not using (for now...).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_client_blt.c
cvs rdiff -u -r1.66 -r1.67 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/i915drm/i915_module.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_client_blt.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_client_blt.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_client_blt.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_client_blt.c:1.3 Sun Dec 19 11:26:35 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_client_blt.c Sun Dec 19 11:27:12 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_client_blt.c,v 1.3 2021/12/19 11:26:35 riastradh Exp $ */
+/* $NetBSD: i915_gem_client_blt.c,v 1.4 2021/12/19 11:27:12 riastradh Exp $ */
// SPDX-License-Identifier: MIT
/*
@@ -6,7 +6,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_client_blt.c,v 1.3 2021/12/19 11:26:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_client_blt.c,v 1.4 2021/12/19 11:27:12 riastradh Exp $");
#include "i915_drv.h"
#include "gt/intel_context.h"
@@ -18,12 +18,7 @@ __KERNEL_RCSID(0, "$NetBSD: i915_gem_cli
struct i915_sleeve {
struct i915_vma *vma;
struct drm_i915_gem_object *obj;
-#ifdef __NetBSD__
- struct pglist *pglist;
- bus_dmamap_t pages; /* XXX ??? XXX ??? */
-#else
struct sg_table *pages;
-#endif
struct i915_page_sizes page_sizes;
};
@@ -176,11 +171,7 @@ static void clear_pages_worker(struct wo
if (obj->cache_dirty) {
if (i915_gem_object_has_struct_page(obj))
-#ifdef __NetBSD__
- drm_clflush_pglist(w->sleeve->pglist);
-#else
drm_clflush_sg(w->sleeve->pages);
-#endif
obj->cache_dirty = false;
}
obj->read_domains = I915_GEM_GPU_DOMAINS;
@@ -267,27 +258,7 @@ clear_pages_work_notify(struct i915_sw_f
return NOTIFY_DONE;
}
-#ifdef __NetBSD__
-/* XXX my kingdom for a non-tentacular link set */
-
-static spinlock_t fence_lock;
-
-void i915_gem_client_blt_init(void);
-void
-i915_gem_client_blt_init(void)
-{
- spin_lock_init(&fence_lock);
-}
-
-void i915_gem_client_blt_fini(void);
-void
-i915_gem_client_blt_fini(void)
-{
- spin_lock_destroy(&fence_lock);
-}
-#else
static DEFINE_SPINLOCK(fence_lock);
-#endif
/* XXX: better name please */
int i915_gem_schedule_fill_pages_blt(struct drm_i915_gem_object *obj,
Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.66 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.67
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.66 Sun Dec 19 11:20:18 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:27:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.66 2021/12/19 11:20:18 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.67 2021/12/19 11:27:12 riastradh Exp $
version 20180827
@@ -113,7 +113,7 @@ file external/bsd/drm2/dist/drm/i915/dis
#file external/bsd/drm2/dist/drm/i915/display/vlv_dsi_pll.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_busy.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_clflush.c i915drmkms
-file external/bsd/drm2/dist/drm/i915/gem/i915_gem_client_blt.c i915drmkms
+#file external/bsd/drm2/dist/drm/i915/gem/i915_gem_client_blt.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_context.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_dmabuf.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_domain.c i915drmkms
Index: src/sys/external/bsd/drm2/i915drm/i915_module.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_module.c:1.12 src/sys/external/bsd/drm2/i915drm/i915_module.c:1.13
--- src/sys/external/bsd/drm2/i915drm/i915_module.c:1.12 Sun Dec 19 11:26:35 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_module.c Sun Dec 19 11:27:12 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_module.c,v 1.12 2021/12/19 11:26:35 riastradh Exp $ */
+/* $NetBSD: i915_module.c,v 1.13 2021/12/19 11:27:12 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.12 2021/12/19 11:26:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.13 2021/12/19 11:27:12 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -53,8 +53,6 @@ MODULE(MODULE_CLASS_DRIVER, i915drmkms,
struct drm_sysctl_def i915_def = DRM_SYSCTL_INIT();
int i915_global_buddy_init(void); /* XXX */
-void i915_gem_client_blt_init(void); /* XXX */
-void i915_gem_client_blt_fini(void); /* XXX */
static int
i915drmkms_init(void)
@@ -71,7 +69,6 @@ i915drmkms_init(void)
drm_sysctl_init(&i915_def);
spin_lock_init(&mchdev_lock);
- i915_gem_client_blt_init();
return 0;
}
@@ -93,7 +90,6 @@ static void
i915drmkms_fini(void)
{
- i915_gem_client_blt_fini();
spin_lock_destroy(&mchdev_lock);
drm_sysctl_fini(&i915_def);
}
