Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:39:32 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_fbdev.c
src/sys/external/bsd/drm2/i915drm: intelfb.h
Log Message:
i915: Tweak style.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/i915drm/intelfb.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/display/intel_fbdev.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c:1.5 Sun Dec 19 11:38:53 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c Sun Dec 19 11:39:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_fbdev.c,v 1.5 2021/12/19 11:38:53 riastradh Exp $ */
+/* $NetBSD: intel_fbdev.c,v 1.6 2021/12/19 11:39:32 riastradh Exp $ */
/*
* Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.5 2021/12/19 11:38:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.6 2021/12/19 11:39:32 riastradh Exp $");
#include <linux/async.h>
#include <linux/console.h>
@@ -333,6 +333,7 @@ out_unlock:
intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref);
return ret;
}
+
#ifdef __NetBSD__
# undef __iomem
#endif
Index: src/sys/external/bsd/drm2/i915drm/intelfb.h
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.h:1.3 src/sys/external/bsd/drm2/i915drm/intelfb.h:1.4
--- src/sys/external/bsd/drm2/i915drm/intelfb.h:1.3 Sun Dec 19 11:38:46 2021
+++ src/sys/external/bsd/drm2/i915drm/intelfb.h Sun Dec 19 11:39:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intelfb.h,v 1.3 2021/12/19 11:38:46 riastradh Exp $ */
+/* $NetBSD: intelfb.h,v 1.4 2021/12/19 11:39:32 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@ struct intelfb_attach_args {
struct drm_device *ifa_drm_dev;
struct drm_fb_helper *ifa_fb_helper;
struct drm_fb_helper_surface_size ifa_fb_sizes;
- void* ifa_fb_vaddr;
+ void *ifa_fb_vaddr;
};
#endif /* _I915DRM_INTELFB_H_ */
