 @@ -1,14 +1,14 @@
-/*	$NetBSD: intel_opregion.c,v 1.9 2018/08/27 04:58:24 riastradh Exp $	*/
+/*	$NetBSD: intel_opregion.c,v 1.10 2018/08/27 06:16:50 riastradh Exp $	*/
 /*
  * Copyright 2008 Intel Corporation <hong.liu@intel.com>
  * Copyright 2008 Red Hat <mjg@redhat.com>
+ *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
  * without limitation the rights to use, copy, modify, merge, publish,
  * distribute, sub license, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
+ *
 @@ -18,27 +18,27 @@
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  * NON-INFRINGEMENT.  IN NO EVENT SHALL INTEL AND/OR ITS SUPPLIERS BE
  * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_opregion.c,v 1.9 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_opregion.c,v 1.10 2018/08/27 06:16:50 riastradh Exp $");
 #include <linux/printk.h>
 #include <linux/acpi.h>
 #include <acpi/video.h>
 #include <asm/io.h>
 #include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 #ifdef CONFIG_ACPI
 @@ -436,30 +436,32 @@ int intel_opregion_notify_adapter(struct
+	}
 	return -EINVAL;
+}
 static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
+{
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_connector *intel_connector;
 	struct opregion_asle *asle = dev_priv->opregion.asle;
 	DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
 #ifndef __NetBSD__ /* XXX backlight */
 	if (acpi_video_get_backlight_type() == acpi_backlight_native) {
 		DRM_DEBUG_KMS("opregion backlight request ignored\n");
 		return 0;
+	}
 #endif
 	if (!(bclp & ASLE_BCLP_VALID))
 		return ASLC_BACKLIGHT_FAILED;
 	bclp &= ASLE_BCLP_MSK;
 	if (bclp > 255)
 		return ASLC_BACKLIGHT_FAILED;
 	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
 	/*
 	 * Update backlight on all connectors that support backlight (usually
 	 * only one).
 @@ -654,26 +656,27 @@ static int intel_opregion_video_event(st
 	if (!system_opregion)
 		return NOTIFY_DONE;
 	acpi = system_opregion->acpi;
 	if (event->type == 0x80 && ((acpi->cevt & 1) == 0))
 		ret = NOTIFY_BAD;
 	acpi->csts = 0;
 	return ret;
+}
 #endif
 static struct notifier_block intel_opregion_notifier = {
 	.notifier_call = intel_opregion_video_event,
 };
 #endif	/* __NetBSD__ */
 /*
  * Initialise the DIDL field in opregion. This passes a list of devices to
  * the firmware. Values are defined by section B.4.2 of the ACPI specification
  * (version 3)
  */
 static u32 get_did(struct intel_opregion *opregion, int i)
 @@ -997,28 +1000,31 @@ int intel_opregion_setup(struct drm_devi
 	BUILD_BUG_ON(sizeof(struct opregion_swsci) != 0x100);
 	BUILD_BUG_ON(sizeof(struct opregion_asle) != 0x100);
 	pci_read_config_dword(dev->pdev, PCI_ASLS, &asls);
 	DRM_DEBUG_DRIVER("graphic opregion physical addr: 0x%x\n", asls);
 	if (asls == 0) {
 		DRM_DEBUG_DRIVER("ACPI OpRegion not supported!\n");
 		return -ENOTSUPP;
+	}
 #ifdef CONFIG_ACPI
 	INIT_WORK(&opregion->asle_work, asle_work);
 #endif
 #ifdef __NetBSD__
 	base = acpi_os_ioremap(asls, OPREGION_SIZE);
 #else
 	base = memremap(asls, OPREGION_SIZE, MEMREMAP_WB);
 #endif
 	if (!base)
 		return -ENOMEM;
 	memcpy(buf, base, sizeof(buf));
 	if (memcmp(buf, OPREGION_SIGNATURE, 16)) {
 		DRM_DEBUG_DRIVER("opregion signature mismatch\n");
 		err = -EINVAL;
 		goto err_out;
+	}
 	opregion->header = base;
 	opregion->vbt = (char *)base + OPREGION_VBT_OFFSET;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intel_sdvo.c,v 1.9 2018/08/27 04:58:24 riastradh Exp $	*/
+/*	$NetBSD: intel_sdvo.c,v 1.10 2018/08/27 06:16:50 riastradh Exp $	*/
 /*
  * Copyright 2006 Dave Airlie <airlied@linux.ie>
  * Copyright © 2006-2007 Intel Corporation
  *   Jesse Barnes <jesse.barnes@intel.com>
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
 @@ -18,31 +18,32 @@
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
  * Authors:
  *	Eric Anholt <eric@anholt.net>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.9 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.10 2018/08/27 06:16:50 riastradh Exp $");
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/export.h>
 #include <linux/bitops.h>
 #include <linux/module.h>
 #include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
 #include "intel_drv.h"
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_sdvo_regs.h"
 #define SDVO_TMDS_MASK (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intel_panel.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $	*/
+/*	$NetBSD: intel_panel.c,v 1.8 2018/08/27 06:16:50 riastradh Exp $	*/
 /*
  * Copyright © 2006-2010 Intel Corporation
  * Copyright (c) 2006 Dave Airlie <airlied@linux.ie>
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice (including the next
 @@ -21,27 +21,27 @@
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
  * Authors:
  *	Eric Anholt <eric@anholt.net>
  *      Dave Airlie <airlied@linux.ie>
  *      Jesse Barnes <jesse.barnes@intel.com>
  *      Chris Wilson <chris@chris-wilson.co.uk>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.8 2018/08/27 06:16:50 riastradh Exp $");
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/kernel.h>
 #include <linux/moduleparam.h>
 #include <linux/module.h>
 #include <linux/printk.h>
 #include <asm/div64.h>
 #include <linux/pwm.h>
 #include "intel_drv.h"
 #define CRC_PMIC_PWM_PERIOD_NS	21333
 @@ -852,28 +852,30 @@ void intel_panel_disable_backlight(struc
 	/*
 	 * Do not disable backlight on the vga_switcheroo path. When switching
 	 * away from i915, the other client may depend on i915 to handle the
 	 * backlight. This will leave the backlight on unnecessarily when
 	 * another client is not activated.
 	 */
 	if (dev->switch_power_state == DRM_SWITCH_POWER_CHANGING) {
 		DRM_DEBUG_DRIVER("Skipping backlight disable on vga switch\n");
 		return;
+	}
 	mutex_lock(&dev_priv->backlight_lock);
 #ifndef __NetBSD__		/* XXX backlight */
 	if (panel->backlight.device)
 		panel->backlight.device->props.power = FB_BLANK_POWERDOWN;
 #endif
 	panel->backlight.enabled = false;
 	panel->backlight.disable(connector);
 	mutex_unlock(&dev_priv->backlight_lock);
+}
 static void lpt_enable_backlight(struct intel_connector *connector)
+{
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_panel *panel = &connector->panel;
 	u32 pch_ctl1, pch_ctl2;
 @@ -1131,28 +1133,30 @@ void intel_panel_enable_backlight(struct
 	if (panel->backlight.level <= panel->backlight.min) {
 		panel->backlight.level = panel->backlight.max;
 #ifndef __NetBSD__		/* XXX backlight */
 		if (panel->backlight.device)
 			panel->backlight.device->props.brightness =
 				scale_hw_to_user(connector,
 						 panel->backlight.level,
 						 panel->backlight.device->props.max_brightness);
 #endif
+	}
 	panel->backlight.enable(connector);
 	panel->backlight.enabled = true;
 #ifndef __NetBSD__		/* XXX backlight */
 	if (panel->backlight.device)
 		panel->backlight.device->props.power = FB_BLANK_UNBLANK;
 #endif
 	mutex_unlock(&dev_priv->backlight_lock);
+}
 #if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
 static int intel_backlight_device_update_status(struct backlight_device *bd)
+{
 	struct intel_connector *connector = bl_get_data(bd);
 	struct intel_panel *panel = &connector->panel;
 	struct drm_device *dev = connector->base.dev;
 	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
 	DRM_DEBUG_KMS("updating intel_backlight, brightness=%d/%d\n",

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intel_sprite.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $	*/
+/*	$NetBSD: intel_sprite.c,v 1.4 2018/08/27 06:16:50 riastradh Exp $	*/
 /*
  * Copyright © 2011 Intel Corporation
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
 @@ -22,27 +22,27 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
  * Authors:
  *   Jesse Barnes <jbarnes@virtuousgeek.org>
+ *
  * New plane/sprite handling.
+ *
  * The older chips had a separate interface for programming plane related
  * registers; newer ones are much simpler and we can use the new DRM plane
  * support.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.4 2018/08/27 06:16:50 riastradh Exp $");
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_rect.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_plane_helper.h>
 #include "intel_drv.h"
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 static bool
 format_is_yuv(uint32_t format)
 @@ -80,75 +80,83 @@ static int usecs_to_scanlines(const stru
+ *
  * After a successful call to this function, interrupts will be disabled
  * until a subsequent call to intel_pipe_update_end(). That is done to
  * avoid random delays. The value written to @start_vbl_count should be
  * supplied to intel_pipe_update_end() for error checking.
  */
 void intel_pipe_update_start(struct intel_crtc *crtc)
+{
 	struct drm_device *dev = crtc->base.dev;
 	const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
 	enum pipe pipe = crtc->pipe;
 	long timeout = msecs_to_jiffies_timeout(1);
 	int scanline, min, max, vblank_start;
 #ifdef __NetBSD__
 	drm_waitqueue_t *wq = drm_crtc_vblank_waitqueue(&crtc->base);
 #else
 	wait_queue_head_t *wq = drm_crtc_vblank_waitqueue(&crtc->base);
 	DEFINE_WAIT(wait);
 #endif
 	vblank_start = adjusted_mode->crtc_vblank_start;
 	if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE)
 		vblank_start = DIV_ROUND_UP(vblank_start, 2);
 	/* FIXME needs to be calibrated sensibly */
 	min = vblank_start - usecs_to_scanlines(adjusted_mode, 100);
 	max = vblank_start - 1;
 	local_irq_disable();
 	if (min <= 0 || max <= 0)
 		return;
 	if (WARN_ON(drm_crtc_vblank_get(&crtc->base)))
 		return;
 	crtc->debug.min_vbl = min;
 	crtc->debug.max_vbl = max;
 	trace_i915_pipe_update_start(crtc);
 #ifdef __NetBSD__
 	panic("XXX");
 #else
 	for (;;) {
 		/*
 		 * prepare_to_wait() has a memory barrier, which guarantees
 		 * other CPUs can see the task state update by the time we
 		 * read the scanline.
 		 */
 		prepare_to_wait(wq, &wait, TASK_UNINTERRUPTIBLE);
 		scanline = intel_get_crtc_scanline(crtc);
 		if (scanline < min || scanline > max)
 			break;
 		if (timeout <= 0) {
 			DRM_ERROR("Potential atomic update failure on pipe %c\n",
 				  pipe_name(crtc->pipe));
 			break;
+		}
 		local_irq_enable();
 		timeout = schedule_timeout(timeout);
 		local_irq_disable();
+	}
 	finish_wait(wq, &wait);
 #endif
 	drm_crtc_vblank_put(&crtc->base);
 	crtc->debug.scanline_start = scanline;
 	crtc->debug.start_vbl_time = ktime_get();
 	crtc->debug.start_vbl_count =
 		dev->driver->get_vblank_counter(dev, pipe);
 	trace_i915_pipe_update_vblank_evaded(crtc);
+}
 /**
  * intel_pipe_update_end() - end update of a set of display registers

 @@ -1,14 +1,14 @@
-/*	$NetBSD: time.h,v 1.3 2014/07/16 20:56:25 riastradh Exp $	*/
+/*	$NetBSD: time.h,v 1.4 2018/08/27 06:16:50 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,26 +24,28 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _LINUX_TIME_H_
 #define _LINUX_TIME_H_
 #include <sys/time.h>
 #define NSEC_PER_MSEC	1000000L
 /*
  * XXX get_seconds as implemented by Linux is a Y2038 bug waiting to
  * happen on 32-bit systems because it returns unsigned long.  Some
  * callers in Linux (implicitly) convert the result to time_t, though.
  * We'll pretend get_seconds returns time_t and make sure all our
  * callers treat it as if it did.
  */
 static inline time_t
 get_seconds(void)
+{
 	return time_second;
+}

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: timer.h,v 1.5 2014/08/26 17:26:05 riastradh Exp $ */	1	/* $NetBSD: timer.h,v 1.6 2018/08/27 06:16:50 riastradh Exp $ */
2		2
3	/*-	3	/*-
4	* Copyright (c) 2013 The NetBSD Foundation, Inc.	4	* Copyright (c) 2013 The NetBSD Foundation, Inc.
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* This code is derived from software contributed to The NetBSD Foundation	7	* This code is derived from software contributed to The NetBSD Foundation
8	* by Taylor R. Campbell.	8	* by Taylor R. Campbell.
9	*	9	*
10	* Redistribution and use in source and binary forms, with or without	10	* Redistribution and use in source and binary forms, with or without
11	* modification, are permitted provided that the following conditions	11	* modification, are permitted provided that the following conditions
12	* are met:	12	* are met:
13	* 1. Redistributions of source code must retain the above copyright	13	* 1. Redistributions of source code must retain the above copyright
14	* notice, this list of conditions and the following disclaimer.	14	* notice, this list of conditions and the following disclaimer.
	@@ -79,31 +79,32 @@ mod_timer_pinned(struct timer_list *time		@@ -79,31 +79,32 @@ mod_timer_pinned(struct timer_list *time
79	{	79	{
80		80
81	/* XXX Stay on the same CPU it was originally on... */	81	/* XXX Stay on the same CPU it was originally on... */
82	mod_timer(timer, then);	82	mod_timer(timer, then);
83	}	83	}
84		84
85	static inline void	85	static inline void
86	del_timer(struct timer_list *timer)	86	del_timer(struct timer_list *timer)
87	{	87	{
88		88
89	callout_stop(&timer->tl_callout);	89	callout_stop(&timer->tl_callout);
90	}	90	}
91		91
92	static inline void	92	static inline bool
93	del_timer_sync(struct timer_list *timer)	93	del_timer_sync(struct timer_list *timer)
94	{	94	{
95		95
96	callout_halt(&timer->tl_callout, NULL);	96	/* XXX return values? */
		97	return callout_halt(&timer->tl_callout, NULL);
97	}	98	}
98		99
99	static inline bool	100	static inline bool
100	timer_pending(struct timer_list *timer)	101	timer_pending(struct timer_list *timer)
101	{	102	{
102		103
103	return callout_pending(&timer->tl_callout);	104	return callout_pending(&timer->tl_callout);
104	}	105	}
105		106
106	/*	107	/*
107	* XXX This is bogus -- the Linux version does various machinations to	108	* XXX This is bogus -- the Linux version does various machinations to
108	* give some jitter so that stuff doesn't wake up all at once.	109	* give some jitter so that stuff doesn't wake up all at once.
109	*/	110	*/