Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:39:20 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core:
nouveau_nvkm_core_engine.c nouveau_nvkm_core_ioctl.c
nouveau_nvkm_core_object.c nouveau_nvkm_core_subdev.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device:
nouveau_nvkm_engine_device_base.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/ltc:
nouveau_nvkm_subdev_ltc_gf100.c
Log Message:
Fix 64-bit printfs.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_engine.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_subdev.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_ioctl.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/ltc/nouveau_nvkm_subdev_ltc_gf100.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/nouveau/nvkm/core/nouveau_nvkm_core_engine.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_engine.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_engine.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_engine.c:1.2 Mon Aug 27 04:58:30 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_engine.c Mon Aug 27 07:39:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_core_engine.c,v 1.2 2018/08/27 04:58:30 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_core_engine.c,v 1.3 2018/08/27 07:39:20 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_engine.c,v 1.2 2018/08/27 04:58:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_engine.c,v 1.3 2018/08/27 07:39:20 riastradh Exp $");
#include <core/engine.h>
#include <core/device.h>
@@ -112,7 +112,7 @@ nvkm_engine_init(struct nvkm_subdev *sub
engine->subdev.oneinit = true;
time = ktime_to_us(ktime_get()) - time;
- nvkm_trace(subdev, "one-time init completed in %lldus\n", time);
+ nvkm_trace(subdev, "one-time init completed in %"PRId64"us\n", time);
}
if (engine->func->init)
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_subdev.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_subdev.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_subdev.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_subdev.c:1.2 Mon Aug 27 04:58:30 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_subdev.c Mon Aug 27 07:39:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_core_subdev.c,v 1.2 2018/08/27 04:58:30 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_core_subdev.c,v 1.3 2018/08/27 07:39:20 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_subdev.c,v 1.2 2018/08/27 04:58:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_subdev.c,v 1.3 2018/08/27 07:39:20 riastradh Exp $");
#include <core/subdev.h>
#include <core/device.h>
@@ -111,7 +111,7 @@ nvkm_subdev_fini(struct nvkm_subdev *sub
}
time = ktime_to_us(ktime_get()) - time;
- nvkm_trace(subdev, "%s completed in %lldus\n", action, time);
+ nvkm_trace(subdev, "%s completed in %"PRId64"us\n", action, time);
return 0;
}
@@ -132,7 +132,7 @@ nvkm_subdev_preinit(struct nvkm_subdev *
}
time = ktime_to_us(ktime_get()) - time;
- nvkm_trace(subdev, "preinit completed in %lldus\n", time);
+ nvkm_trace(subdev, "preinit completed in %"PRId64"us\n", time);
return 0;
}
@@ -157,7 +157,7 @@ nvkm_subdev_init(struct nvkm_subdev *sub
subdev->oneinit = true;
time = ktime_to_us(ktime_get()) - time;
- nvkm_trace(subdev, "one-time init completed in %lldus\n", time);
+ nvkm_trace(subdev, "one-time init completed in %"PRId64"us\n", time);
}
if (subdev->func->init) {
@@ -169,7 +169,7 @@ nvkm_subdev_init(struct nvkm_subdev *sub
}
time = ktime_to_us(ktime_get()) - time;
- nvkm_trace(subdev, "init completed in %lldus\n", time);
+ nvkm_trace(subdev, "init completed in %"PRId64"us\n", time);
return 0;
}
@@ -185,7 +185,7 @@ nvkm_subdev_del(struct nvkm_subdev **psu
if (subdev->func->dtor)
*psubdev = subdev->func->dtor(subdev);
time = ktime_to_us(ktime_get()) - time;
- nvkm_trace(subdev, "destroy completed in %lldus\n", time);
+ nvkm_trace(subdev, "destroy completed in %"PRId64"us\n", time);
kfree(*psubdev);
*psubdev = NULL;
}
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_ioctl.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_ioctl.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_ioctl.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_ioctl.c:1.3 Mon Aug 27 07:35:56 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_ioctl.c Mon Aug 27 07:39:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_core_ioctl.c,v 1.3 2018/08/27 07:35:56 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_core_ioctl.c,v 1.4 2018/08/27 07:39:20 riastradh Exp $ */
/*
* Copyright 2014 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs <[email protected]>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_ioctl.c,v 1.3 2018/08/27 07:35:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_ioctl.c,v 1.4 2018/08/27 07:39:20 riastradh Exp $");
#include <core/ioctl.h>
#include <core/client.h>
@@ -43,7 +43,7 @@ nvkm_ioctl_nop(struct nvkm_object *objec
nvif_ioctl(object, "nop size %d\n", size);
if (nvif_unpack(args->v0, 0, 0, false)) {
- nvif_ioctl(object, "nop vers %lld\n", args->v0.version);
+ nvif_ioctl(object, "nop vers %"PRId64"\n", args->v0.version);
args->v0.version = NVIF_VERSION_LATEST;
}
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c:1.4 Mon Aug 27 07:36:07 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_object.c Mon Aug 27 07:39:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_core_object.c,v 1.4 2018/08/27 07:36:07 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_core_object.c,v 1.5 2018/08/27 07:39:20 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_object.c,v 1.4 2018/08/27 07:36:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_object.c,v 1.5 2018/08/27 07:39:20 riastradh Exp $");
#include <core/object.h>
#include <core/client.h>
@@ -140,7 +140,7 @@ nvkm_object_fini(struct nvkm_object *obj
}
time = ktime_to_us(ktime_get()) - time;
- nvif_debug(object, "%s completed in %lldus\n", action, time);
+ nvif_debug(object, "%s completed in %"PRId64"us\n", action, time);
return 0;
fail:
@@ -179,7 +179,7 @@ nvkm_object_init(struct nvkm_object *obj
}
time = ktime_to_us(ktime_get()) - time;
- nvif_debug(object, "init completed in %lldus\n", time);
+ nvif_debug(object, "init completed in %"PRId64"us\n", time);
return 0;
fail_child:
@@ -210,7 +210,7 @@ nvkm_object_dtor(struct nvkm_object *obj
data = object->func->dtor(object);
nvkm_engine_unref(&object->engine);
time = ktime_to_us(ktime_get()) - time;
- nvif_debug(object, "destroy completed in %lldus...\n", time);
+ nvif_debug(object, "destroy completed in %"PRId64"us...\n", time);
return data;
}
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c:1.3 Mon Aug 27 07:38:42 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c Mon Aug 27 07:39:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_engine_device_base.c,v 1.3 2018/08/27 07:38:42 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_engine_device_base.c,v 1.4 2018/08/27 07:39:20 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.3 2018/08/27 07:38:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.4 2018/08/27 07:39:20 riastradh Exp $");
#include "priv.h"
#include "acpi.h"
@@ -2189,7 +2189,7 @@ nvkm_device_fini(struct nvkm_device *dev
device->func->fini(device, suspend);
time = ktime_to_us(ktime_get()) - time;
- nvdev_trace(device, "%s completed in %lldus...\n", action, time);
+ nvdev_trace(device, "%s completed in %"PRId64"us...\n", action, time);
return 0;
fail:
@@ -2234,7 +2234,7 @@ nvkm_device_preinit(struct nvkm_device *
goto fail;
time = ktime_to_us(ktime_get()) - time;
- nvdev_trace(device, "preinit completed in %lldus\n", time);
+ nvdev_trace(device, "preinit completed in %"PRId64"us\n", time);
return 0;
fail:
@@ -2275,7 +2275,7 @@ nvkm_device_init(struct nvkm_device *dev
nvkm_acpi_init(device);
time = ktime_to_us(ktime_get()) - time;
- nvdev_trace(device, "init completed in %lldus\n", time);
+ nvdev_trace(device, "init completed in %"PRId64"us\n", time);
return 0;
fail_subdev:
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/ltc/nouveau_nvkm_subdev_ltc_gf100.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/ltc/nouveau_nvkm_subdev_ltc_gf100.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/ltc/nouveau_nvkm_subdev_ltc_gf100.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/ltc/nouveau_nvkm_subdev_ltc_gf100.c:1.2 Mon Aug 27 04:58:34 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/ltc/nouveau_nvkm_subdev_ltc_gf100.c Mon Aug 27 07:39:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_subdev_ltc_gf100.c,v 1.2 2018/08/27 04:58:34 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_subdev_ltc_gf100.c,v 1.3 2018/08/27 07:39:20 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_ltc_gf100.c,v 1.2 2018/08/27 04:58:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_ltc_gf100.c,v 1.3 2018/08/27 07:39:20 riastradh Exp $");
#include "priv.h"
@@ -139,7 +139,7 @@ gf100_ltc_invalidate(struct nvkm_ltc *lt
nvkm_warn(<c->subdev, "LTC invalidate timeout\n");
if (taken > 0)
- nvkm_debug(<c->subdev, "LTC invalidate took %lld ns\n", taken);
+ nvkm_debug(<c->subdev, "LTC invalidate took %"PRId64" ns\n", taken);
}
void
@@ -154,7 +154,7 @@ gf100_ltc_flush(struct nvkm_ltc *ltc)
nvkm_warn(<c->subdev, "LTC flush timeout\n");
if (taken > 0)
- nvkm_debug(<c->subdev, "LTC flush took %lld ns\n", taken);
+ nvkm_debug(<c->subdev, "LTC flush took %"PRId64" ns\n", taken);
}
/* TODO: Figure out tag memory details and drop the over-cautious allocation.
