 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_crtc.c,v 1.7 2018/08/27 06:52:24 riastradh Exp $	*/
+/*	$NetBSD: drm_crtc.c,v 1.8 2018/08/27 06:55:13 riastradh Exp $	*/
 /*
  * Copyright (c) 2006-2008 Intel Corporation
  * Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
  * Copyright (c) 2008 Red Hat Inc.
+ *
  * DRM core CRTC related functions
+ *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
  * the above copyright notice appear in all copies and that both that copyright
  * notice and this permission notice appear in supporting documentation, and
  * that the name of the copyright holders not be used in advertising or
 @@ -22,27 +22,27 @@
  * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
+ *
  * Authors:
  *      Keith Packard
  *	Eric Anholt <eric@anholt.net>
  *      Dave Airlie <airlied@linux.ie>
  *      Jesse Barnes <jesse.barnes@intel.com>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_crtc.c,v 1.7 2018/08/27 06:52:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_crtc.c,v 1.8 2018/08/27 06:55:13 riastradh Exp $");
 #include <linux/err.h>
 #include <linux/spinlock.h>
 #include <linux/ctype.h>
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/export.h>
 #include <linux/errno.h>
 #include <asm/bug.h>
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_fourcc.h>
 @@ -1025,27 +1025,29 @@ unsigned int drm_connector_index(struct
 EXPORT_SYMBOL(drm_connector_index);
 /**
  * drm_connector_register - register a connector
  * @connector: the connector to register
+ *
  * Register userspace interfaces for a connector
+ *
  * Returns:
  * Zero on success, error code on failure.
  */
 int drm_connector_register(struct drm_connector *connector)
+{
 #ifndef __NetBSD__		/* XXX sysfs, debugfs */
 	int ret;
 #endif
 	drm_mode_object_register(connector->dev, &connector->base);
 #ifndef __NetBSD__		/* XXX sysfs, debugfs */
 	ret = drm_sysfs_connector_add(connector);
 	if (ret)
 		return ret;
 	ret = drm_debugfs_connector_add(connector);
 	if (ret) {
 		drm_sysfs_connector_remove(connector);
 		return ret;
+	}
 @@ -3051,26 +3053,27 @@ EXPORT_SYMBOL(drm_mode_legacy_fb_format)
  * original addfb ioctl which only supported RGB formats.
+ *
  * Called by the user via ioctl.
+ *
  * Returns:
  * Zero on success, negative errno on failure.
  */
 int drm_mode_addfb(struct drm_device *dev,
 		   void *data, struct drm_file *file_priv)
+{
 	struct drm_mode_fb_cmd *or = data;
 	static const struct drm_mode_fb_cmd2 zero_fbcmd;
 	struct drm_mode_fb_cmd2 r = zero_fbcmd;
 	int ret;
 	/* convert to new format and call new ioctl */
 	r.fb_id = or->fb_id;
 	r.width = or->width;
 	r.height = or->height;
 	r.pitches[0] = or->pitch;
 	r.pixel_format = drm_mode_legacy_fb_format(or->bpp, or->depth);
 	r.handles[0] = or->handle;
 	ret = drm_mode_addfb2(dev, &r, file_priv);
 	if (ret)
 		return ret;
 @@ -3189,27 +3192,27 @@ static int framebuffer_check(const struc
 		if ((uint64_t) width * cpp > UINT_MAX)
 			return -ERANGE;
 		if ((uint64_t) height * r->pitches[i] + r->offsets[i] > UINT_MAX)
 			return -ERANGE;
 		if (r->pitches[i] < width * cpp) {
 			DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i);
 			return -EINVAL;
+		}
 		if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) {
-			DRM_DEBUG_KMS("bad fb modifier %llu for plane %d\n",
+			DRM_DEBUG_KMS("bad fb modifier %"PRIu64" for plane %d\n",
 				      r->modifier[i], i);
 			return -EINVAL;
+		}
 		/* modifier specific checks: */
 		switch (r->modifier[i]) {
 		case DRM_FORMAT_MOD_SAMSUNG_64_32_TILE:
 			/* NOTE: the pitch restriction may be lifted later if it turns
 			 * out that no hw has this restriction:
 			 */
 			if (r->pixel_format != DRM_FORMAT_NV12 ||
 					width % 128 || height % 32 ||
 					r->pitches[i] % 128) {