Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/dist/drm Fix up drm_crtc.c.
details: https://anonhg.NetBSD.org/src/rev/8bfc446451ed
branches: trunk
changeset: 992533:8bfc446451ed
user: riastradh <riastradh%NetBSD.org@localhost>
date: Mon Aug 27 06:55:13 2018 +0000
description:
Fix up drm_crtc.c.
- Ifdef out debugfs variables.
- Restore int ret declaration lost in merge.
- Use PRIu64, not %llu, for uint64_t.
diffstat:
sys/external/bsd/drm2/dist/drm/drm_crtc.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diffs (45 lines):
diff -r 398b2fbc59ec -r 8bfc446451ed sys/external/bsd/drm2/dist/drm/drm_crtc.c
--- a/sys/external/bsd/drm2/dist/drm/drm_crtc.c Mon Aug 27 06:55:01 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_crtc.c Mon Aug 27 06:55:13 2018 +0000
@@ -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 <jesse.barnes%intel.com@localhost>
*/
#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 @@
*/
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 @@
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 @@
}
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;
}
Home |
Main Index |
Thread Index |
Old Index