projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c04c5b1
)
drm/nv50: correct wait condition for instmem flush
author
Ben Skeggs
<bskeggs@redhat.com>
Sun, 25 Jul 2010 23:11:04 +0000
(09:11 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Mon, 26 Jul 2010 01:43:52 +0000
(11:43 +1000)
Reported-by: Marcin KoĆcielnicki <koriakin@0x04.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_instmem.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/nouveau/nv50_instmem.c
b/drivers/gpu/drm/nouveau/nv50_instmem.c
index 2ed893cbff69881268e49f1122db29bb042dac95..37c7b48ab24af8a37c3e8ac29656b989ec5935f5 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nv50_instmem.c
+++ b/
drivers/gpu/drm/nouveau/nv50_instmem.c
@@
-487,7
+487,7
@@
void
nv50_instmem_flush(struct drm_device *dev)
{
nv_wr32(dev, 0x00330c, 0x00000001);
- if (!nv_wait(0x00330c, 0x0000000
1
, 0x00000000))
+ if (!nv_wait(0x00330c, 0x0000000
2
, 0x00000000))
NV_ERROR(dev, "PRAMIN flush timeout\n");
}
@@
-495,7
+495,7
@@
void
nv84_instmem_flush(struct drm_device *dev)
{
nv_wr32(dev, 0x070000, 0x00000001);
- if (!nv_wait(0x070000, 0x0000000
1
, 0x00000000))
+ if (!nv_wait(0x070000, 0x0000000
2
, 0x00000000))
NV_ERROR(dev, "PRAMIN flush timeout\n");
}