OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e2822b7
)
drm/nvc0/fifo: use runlist event instead of polling
author
Ben Skeggs
<bskeggs@redhat.com>
Fri, 21 Feb 2014 15:05:01 +0000
(
01:05
+1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Wed, 26 Mar 2014 04:00:45 +0000
(14:00 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
index
97416c6
..
d396516
100644
(file)
--- a/
drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
+++ b/
drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
@@
-96,8
+96,10
@@
nvc0_fifo_runlist_update(struct nvc0_fifo_priv *priv)
nv_wr32(priv, 0x002270, cur->addr >> 12);
nv_wr32(priv, 0x002274, 0x01f00000 | (p >> 3));
- if (!nv_wait(priv, 0x00227c, 0x00100000, 0x00000000))
- nv_error(priv, "runlist update failed\n");
+ if (wait_event_timeout(priv->runlist.wait,
+ !(nv_rd32(priv, 0x00227c) & 0x00100000),
+ msecs_to_jiffies(2000)) == 0)
+ nv_error(priv, "runlist update timeout\n");
mutex_unlock(&nv_subdev(priv)->mutex);
}