Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:55:13 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_crtc.c
Log Message:
Fix up drm_crtc.c.
- Ifdef out debugfs variables.
- Restore int ret declaration lost in merge.
- Use PRIu64, not %llu, for uint64_t.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/drm_crtc.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/drm_crtc.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.7 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.7 Mon Aug 27 06:52:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_crtc.c Mon Aug 27 06:55:13 2018
@@ -1,4 +1,4 @@
-/* $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
@@ -32,7 +32,7 @@
* Jesse Barnes <[email protected]>
*/
#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>
@@ -1035,7 +1035,9 @@ EXPORT_SYMBOL(drm_connector_index);
*/
int drm_connector_register(struct drm_connector *connector)
{
+#ifndef __NetBSD__ /* XXX sysfs, debugfs */
int ret;
+#endif
drm_mode_object_register(connector->dev, &connector->base);
@@ -3061,6 +3063,7 @@ int drm_mode_addfb(struct drm_device *de
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;
@@ -3199,7 +3202,7 @@ static int framebuffer_check(const struc
}
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;
}
