Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:27:52 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_pm.c
src/sys/external/bsd/drm2/i915drm: i915_module.c
Log Message:
Fix definition and initialization of mchdev_lock.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
cvs rdiff -u -r1.5 -r1.6 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/intel_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.12 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.12 Mon Aug 27 07:26:59 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Mon Aug 27 07:27:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_pm.c,v 1.12 2018/08/27 07:26:59 riastradh Exp $ */
+/* $NetBSD: intel_pm.c,v 1.13 2018/08/27 07:27:51 riastradh Exp $ */
/*
* Copyright © 2012 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.12 2018/08/27 07:26:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.13 2018/08/27 07:27:51 riastradh Exp $");
#include <linux/bitops.h>
#include <linux/cpufreq.h>
@@ -4174,7 +4174,11 @@ void intel_update_sprite_watermarks(stru
/**
* Lock protecting IPS related data structures
*/
+#ifdef __NetBSD__
+spinlock_t mchdev_lock;
+#else
DEFINE_SPINLOCK(mchdev_lock);
+#endif
/* Global for IPS driver to get at the current i915 device. Protected by
* mchdev_lock. */
Index: src/sys/external/bsd/drm2/i915drm/i915_module.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_module.c:1.5 src/sys/external/bsd/drm2/i915drm/i915_module.c:1.6
--- src/sys/external/bsd/drm2/i915drm/i915_module.c:1.5 Wed Nov 12 03:14:00 2014
+++ src/sys/external/bsd/drm2/i915drm/i915_module.c Mon Aug 27 07:27:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_module.c,v 1.5 2014/11/12 03:14:00 christos Exp $ */
+/* $NetBSD: i915_module.c,v 1.6 2018/08/27 07:27:51 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.5 2014/11/12 03:14:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.6 2018/08/27 07:27:51 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -78,6 +78,7 @@ i915drmkms_init(void)
return error;
}
drm_sysctl_init(&i915_def);
+ spin_lock_init(&mchdev_lock);
return 0;
}
@@ -99,8 +100,9 @@ static void
i915drmkms_fini(void)
{
- drm_pci_exit(i915_drm_driver, NULL);
+ spin_lock_destroy(&mchdev_lock);
drm_sysctl_fini(&i915_def);
+ drm_pci_exit(i915_drm_driver, NULL);
}
static int
