Module Name: src
Committed By: riastradh
Date: Thu Jul 28 10:42:46 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/scheduler: sched_fence.c
src/sys/modules/drmkms_sched: Makefile
Removed Files:
src/sys/external/bsd/drm2/drm: sched_module.c
Log Message:
drmkms_sched: Remove duplicate module definition.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c
cvs rdiff -u -r1.1 -r0 src/sys/external/bsd/drm2/drm/sched_module.c
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/drmkms_sched/Makefile
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/scheduler/sched_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c:1.5 src/sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c:1.5 Sun Dec 19 12:32:45 2021
+++ src/sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c Thu Jul 28 10:42:45 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sched_fence.c,v 1.5 2021/12/19 12:32:45 riastradh Exp $ */
+/* $NetBSD: sched_fence.c,v 1.6 2022/07/28 10:42:45 riastradh Exp $ */
/*
* Copyright 2015 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sched_fence.c,v 1.5 2021/12/19 12:32:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sched_fence.c,v 1.6 2022/07/28 10:42:45 riastradh Exp $");
#include <linux/kthread.h>
#include <linux/module.h>
@@ -194,7 +194,8 @@ MODULE_DESCRIPTION("DRM GPU scheduler");
MODULE_LICENSE("GPL and additional rights");
#ifdef __NetBSD__
-MODULE(MODULE_CLASS_MISC, drmsched, NULL);
+MODULE(MODULE_CLASS_MISC, drmkms_sched, "drmkms,drmkms_linux");
+
static int
drmsched_modcmd(modcmd_t cmd, void *arg)
{
Index: src/sys/modules/drmkms_sched/Makefile
diff -u src/sys/modules/drmkms_sched/Makefile:1.3 src/sys/modules/drmkms_sched/Makefile:1.4
--- src/sys/modules/drmkms_sched/Makefile:1.3 Thu Jul 28 10:41:07 2022
+++ src/sys/modules/drmkms_sched/Makefile Thu Jul 28 10:42:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/07/28 10:41:07 riastradh Exp $
+# $NetBSD: Makefile,v 1.4 2022/07/28 10:42:46 riastradh Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -11,7 +11,6 @@ KMOD= drmkms_sched
SRCS+= sched_entity.c
SRCS+= sched_fence.c
SRCS+= sched_main.c
-SRCS+= sched_module.c
WARNS= 3
