summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:10 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:37:31 +1000
commit43615871b64e6ae23de4b73f3a82a29e1bcbb3e9 (patch)
tree4e9d9c6e61e1cf1c803833c31056b0ca7c21eb0e /lib
parent49f8a0b9c3a0ef0c0f4ad20caa6b614e0f510e64 (diff)
downloadnouveau-43615871b64e6ae23de4b73f3a82a29e1bcbb3e9.tar.gz
tmr: type-safe PTIMER-based delay/wait macros
These require an explicit struct nvkm_device pointer, unlike the previous macros which take a void *, and work for (almost) anything derived from nvkm_object by using some heuristics. These macros are more general than the previous ones, and can be used to handle PTIMER-based busy-waits (will be used in later devinit fixes) as well as more complicated wait conditions. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/include/nvif/os.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/include/nvif/os.h b/lib/include/nvif/os.h
index bd958403c..3ed79cc12 100644
--- a/lib/include/nvif/os.h
+++ b/lib/include/nvif/os.h
@@ -636,6 +636,11 @@ struct device {
struct device_driver *driver;
};
+#define dev_crit(d,f,a...) printf("nouveau: "f, ##a)
+#define dev_err(d,f,a...) dev_crit((d), f, ##a)
+#define dev_warn(d,f,a...) dev_crit((d), f, ##a)
+#define dev_info(d,f,a...) dev_crit((d), f, ##a)
+
/******************************************************************************
* PM runtime
*****************************************************************************/