Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:50:45 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_atomic_helper.c
src/sys/external/bsd/drm2/drm: files.drmkms
Log Message:
Patch up drm_atomic_helper.c.
- Mark unused variables as such.
. Mistakes in local patches are likely to lead to unused variables,
so keep this warning enabled.
- Build with -Wno-shadow.
. Local patches aren't likely to cause this, so just suppress it.
- static plane_crtc_active
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/drm/files.drmkms
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_atomic_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.3 src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.3 Mon Aug 27 06:48:40 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c Mon Aug 27 06:50:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_atomic_helper.c,v 1.3 2018/08/27 06:48:40 riastradh Exp $ */
+/* $NetBSD: drm_atomic_helper.c,v 1.4 2018/08/27 06:50:45 riastradh Exp $ */
/*
* Copyright (C) 2014 Red Hat
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_atomic_helper.c,v 1.3 2018/08/27 06:48:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_atomic_helper.c,v 1.4 2018/08/27 06:50:45 riastradh Exp $");
#include <drm/drmP.h>
#include <drm/drm_atomic.h>
@@ -385,7 +385,7 @@ drm_atomic_helper_check_modeset(struct d
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
struct drm_connector *connector;
- struct drm_connector_state *connector_state;
+ struct drm_connector_state *connector_state __unused;
int i, ret;
for_each_crtc_in_state(state, crtc, crtc_state, i) {
@@ -741,7 +741,7 @@ crtc_set_mode(struct drm_device *dev, st
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state;
struct drm_connector *connector;
- struct drm_connector_state *old_conn_state;
+ struct drm_connector_state *old_conn_state __unused;
int i;
for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) {
@@ -835,9 +835,9 @@ void drm_atomic_helper_commit_modeset_en
struct drm_atomic_state *old_state)
{
struct drm_crtc *crtc;
- struct drm_crtc_state *old_crtc_state;
+ struct drm_crtc_state *old_crtc_state __unused;
struct drm_connector *connector;
- struct drm_connector_state *old_conn_state;
+ struct drm_connector_state *old_conn_state __unused;
int i;
for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) {
@@ -983,10 +983,19 @@ drm_atomic_helper_wait_for_vblanks(struc
if (!old_crtc_state->enable)
continue;
+#ifdef __NetBSD__
+ spin_lock(&dev->vbl_lock);
+ DRM_SPIN_WAIT_ON(ret, &dev->vblank[i].queue, &dev->vbl_lock,
+ msecs_to_jiffies(50),
+ (old_crtc_state->last_vblank_count !=
+ drm_crtc_vblank_count(crtc)));
+ spin_unlock(&dev->vbl_lock);
+#else
ret = wait_event_timeout(dev->vblank[i].queue,
old_crtc_state->last_vblank_count !=
drm_crtc_vblank_count(crtc),
msecs_to_jiffies(50));
+#endif
drm_crtc_vblank_put(crtc);
}
@@ -1172,7 +1181,7 @@ fail:
}
EXPORT_SYMBOL(drm_atomic_helper_prepare_planes);
-bool plane_crtc_active(struct drm_plane_state *state)
+static bool plane_crtc_active(struct drm_plane_state *state)
{
return state->crtc && state->crtc->state->active;
}
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.22 src/sys/external/bsd/drm2/drm/files.drmkms:1.23
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.22 Mon Aug 27 06:47:51 2018
+++ src/sys/external/bsd/drm2/drm/files.drmkms Mon Aug 27 06:50:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.22 2018/08/27 06:47:51 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.23 2018/08/27 06:50:45 riastradh Exp $
include "external/bsd/drm2/linux/files.drmkms_linux"
@@ -24,6 +24,7 @@ makeoptions drmkms CPPFLAGS+="-I$S/exte
# under dist/include/uapi rather than dist/uapi.)
makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist"
+makeoptions drmkms "CWARNFLAGS.drm_atomic_helper.c"+="-Wno-shadow"
makeoptions drmkms "CWARNFLAGS.drm_crtc.c"+="-Wno-shadow"
makeoptions drmkms "CWARNFLAGS.drm_crtc.c"+="-Wno-missing-field-initializers"
makeoptions drmkms "CWARNFLAGS.drm_edid.c"+="-Wno-shadow"
