projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
69405d3
)
drm/nouveau/ibus/gk20a: use udelay() in interrupt context
author
Alexandre Courbot
<gnurou@gmail.com>
Wed, 6 Jul 2016 14:04:56 +0000
(23:04 +0900)
committer
Ben Skeggs
<bskeggs@redhat.com>
Wed, 12 Oct 2016 07:29:02 +0000
(17:29 +1000)
gk20a_ibus_init_ibus_ring() can be called from gk20a_ibus_intr(), in
non-interruptible context. Replace use of usleep_range() with udelay().
Reported-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c
index
b7159b3
..
1a4ab82
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c
+++ b/
drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c
@@
-29,7
+29,7
@@
gk20a_ibus_init_ibus_ring(struct nvkm_subdev *ibus)
nvkm_mask(device, 0x137250, 0x3f, 0);
nvkm_mask(device, 0x000200, 0x20, 0);
- u
sleep_range(20, 3
0);
+ u
delay(2
0);
nvkm_mask(device, 0x000200, 0x20, 0x20);
nvkm_wr32(device, 0x12004c, 0x4);