OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5112abc
)
drm/nouveau/tmr: provide backtrace when a timeout is hit
author
Ben Skeggs
<bskeggs@redhat.com>
Fri, 17 Feb 2017 05:08:10 +0000
(15:08 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Fri, 17 Feb 2017 07:38:18 +0000
(17:38 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
index
82d3e28
..
6a567fe
100644
(file)
--- a/
drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
+++ b/
drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
@@
-48,10
+48,8
@@
void nvkm_timer_alarm_cancel(struct nvkm_timer *, struct nvkm_alarm *);
} while (_taken = nvkm_timer_read(_tmr) - _time0, _taken < _nsecs); \
\
if (_taken >= _nsecs) { \
- if (_warn) { \
- dev_warn(_device->dev, "timeout at %s:%d/%s()!\n", \
- __FILE__, __LINE__, __func__); \
- } \
+ if (_warn) \
+ dev_WARN(_device->dev, "timeout\n"); \
_taken = -ETIMEDOUT; \
} \
_taken; \