Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:18:30 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c i915_drv.h
intel_drv.h
src/sys/external/bsd/drm2/include/asm: bug.h
src/sys/external/bsd/drm2/include/linux: jiffies.h
Log Message:
don't provide dev_to_i915 and ifdef out all users (unused)
provide nsecs_to_jiffies64, hopefully msec_to_jiffies * 10^6
provide BUILD_BUG as a no-op
include linux/err.h instead of matching side-loading, too hard to
figure out what gets it.
Author: coypu <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/asm/bug.h
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/include/linux/jiffies.h
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/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.7 Mon Aug 27 04:58:23 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Mon Aug 27 06:18:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.7 2018/08/27 04:58:23 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.8 2018/08/27 06:18:30 riastradh Exp $ */
/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
*/
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.7 2018/08/27 04:58:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.8 2018/08/27 06:18:30 riastradh Exp $");
#include <linux/device.h>
#include <linux/acpi.h>
@@ -1031,6 +1031,7 @@ i915_pci_remove(struct pci_dev *pdev)
drm_put_dev(dev);
}
+#ifndef __NetBSD__
static int i915_pm_suspend(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
@@ -1095,6 +1096,7 @@ static int i915_pm_resume(struct device
return i915_drm_resume(drm_dev);
}
+#endif
static int skl_suspend_complete(struct drm_i915_private *dev_priv)
{
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.13 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.14
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.13 Mon Aug 27 06:17:05 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Mon Aug 27 06:18:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.h,v 1.13 2018/08/27 06:17:05 riastradh Exp $ */
+/* $NetBSD: i915_drv.h,v 1.14 2018/08/27 06:18:30 riastradh Exp $ */
/* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
*/
@@ -2026,10 +2026,12 @@ static inline struct drm_i915_private *t
return dev->dev_private;
}
+#ifndef __NetBSD__
static inline struct drm_i915_private *dev_to_i915(struct device *dev)
{
return to_i915(dev_get_drvdata(dev));
}
+#endif
static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc)
{
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h:1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h:1.10
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h:1.9 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h Mon Aug 27 06:18:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_drv.h,v 1.9 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: intel_drv.h,v 1.10 2018/08/27 06:18:30 riastradh Exp $ */
/*
* Copyright (c) 2006 Dave Airlie <[email protected]>
@@ -28,6 +28,7 @@
#define __INTEL_DRV_H__
#include <linux/async.h>
+#include <linux/err.h>
#include <linux/i2c.h>
#include <linux/hdmi.h>
#include <asm/processor.h>
Index: src/sys/external/bsd/drm2/include/asm/bug.h
diff -u src/sys/external/bsd/drm2/include/asm/bug.h:1.2 src/sys/external/bsd/drm2/include/asm/bug.h:1.3
--- src/sys/external/bsd/drm2/include/asm/bug.h:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/include/asm/bug.h Mon Aug 27 06:18:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bug.h,v 1.2 2014/03/18 18:20:42 riastradh Exp $ */
+/* $NetBSD: bug.h,v 1.3 2018/08/27 06:18:30 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@
#define BUG() panic("%s:%d: BUG!", __FILE__, __LINE__)
#define BUG_ON(CONDITION) KASSERT(!(CONDITION))
+#define BUILD_BUG() do {} while (0)
#define BUILD_BUG_ON(CONDITION) CTASSERT(!(CONDITION))
/* XXX Rate limit? */
Index: src/sys/external/bsd/drm2/include/linux/jiffies.h
diff -u src/sys/external/bsd/drm2/include/linux/jiffies.h:1.6 src/sys/external/bsd/drm2/include/linux/jiffies.h:1.7
--- src/sys/external/bsd/drm2/include/linux/jiffies.h:1.6 Sat Jul 26 14:24:08 2014
+++ src/sys/external/bsd/drm2/include/linux/jiffies.h Mon Aug 27 06:18:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: jiffies.h,v 1.6 2014/07/26 14:24:08 riastradh Exp $ */
+/* $NetBSD: jiffies.h,v 1.7 2018/08/27 06:18:30 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -41,6 +41,12 @@
/* XXX Er, what? */
#define MAX_JIFFY_OFFSET ((INT_MAX >> 1) - 1)
+static inline uint64_t
+nsecs_to_jiffies64(unsigned int msec)
+{
+ return 1000000*mstohz(msec);
+}
+
static inline unsigned int
msecs_to_jiffies(unsigned int msec)
{
