Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:35:22 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif: unpack.h
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core: client.h
subdev.h
Log Message:
Fake out unhelpful -Wtype-limits.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/unpack.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/client.h \
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/subdev.h
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/nouveau/include/nvif/unpack.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/unpack.h:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/unpack.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/unpack.h:1.2 Mon Aug 27 04:58:30 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/unpack.h Mon Aug 27 07:35:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: unpack.h,v 1.2 2018/08/27 04:58:30 riastradh Exp $ */
+/* $NetBSD: unpack.h,v 1.3 2018/08/27 07:35:22 riastradh Exp $ */
#ifndef __NVIF_UNPACK_H__
#define __NVIF_UNPACK_H__
@@ -11,8 +11,9 @@
#define nvif_unpack(d,vl,vh,m) ({ \
if ((vl) == 0 || ret == -ENOSYS) { \
int _size = sizeof(d); \
- if (_size <= size && (d).version >= (vl) && \
- (d).version <= (vh)) { \
+ if (_size <= size && \
+ ((d).version == (vl) || (d).version > (vl)) && \
+ (d).version <= (vh)) { \
data = (u8 *)data + _size; \
size = size - _size; \
ret = ((m) || !size) ? 0 : -E2BIG; \
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/client.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/client.h:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/client.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/client.h:1.2 Mon Aug 27 04:58:30 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/client.h Mon Aug 27 07:35:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: client.h,v 1.2 2018/08/27 04:58:30 riastradh Exp $ */
+/* $NetBSD: client.h,v 1.3 2018/08/27 07:35:22 riastradh Exp $ */
#ifndef __NVKM_CLIENT_H__
#define __NVKM_CLIENT_H__
@@ -41,7 +41,7 @@ int nvkm_client_notify_put(struct nvkm_c
#define nvif_printk(o,l,p,f,a...) do { \
struct nvkm_object *_object = (o); \
struct nvkm_client *_client = _object->client; \
- if (_client->debug >= NV_DBG_##l) \
+ if (_client->debug == NV_DBG_##l || _client->debug > NV_DBG_##l) \
printk(KERN_##p "nouveau: %s:%08x:%08x: "f, _client->name, \
_object->handle, _object->oclass, ##a); \
} while(0)
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/subdev.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/subdev.h:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/subdev.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/subdev.h:1.2 Mon Aug 27 04:58:30 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/subdev.h Mon Aug 27 07:35:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subdev.h,v 1.2 2018/08/27 04:58:30 riastradh Exp $ */
+/* $NetBSD: subdev.h,v 1.3 2018/08/27 07:35:22 riastradh Exp $ */
#ifndef __NVKM_SUBDEV_H__
#define __NVKM_SUBDEV_H__
@@ -36,7 +36,7 @@ void nvkm_subdev_intr(struct nvkm_subdev
/* subdev logging */
#define nvkm_printk_(s,l,p,f,a...) do { \
struct nvkm_subdev *_subdev = (s); \
- if (_subdev->debug >= (l)) { \
+ if (_subdev->debug == (l) || _subdev->debug > (l)) { \
dev_##p(_subdev->device->dev, "%s: "f, \
nvkm_subdev_name[_subdev->index], ##a); \
} \
