summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalvin Owens <jcalvinowens@gmail.com>2013-04-07 21:01:19 -0500
committerBen Skeggs <bskeggs@redhat.com>2013-04-09 09:16:15 +1000
commitb1ea3e6e3883c5191caa5be72b3a5b9c32812e38 (patch)
tree7106fa43ce888e04fd1bbae458dc160e37fbd71e
parente4604d8fe8492f8120cf92d4b60b3cc90ba87bd0 (diff)
downloadlinux-b1ea3e6e3883c5191caa5be72b3a5b9c32812e38.tar.bz2
drm/nouveau: fix unconditional return waiting on memory
Typo in nv50_display_flip_wait allows page flipping to run ahead before memory has time to settle. Signed-off-by: Calvin Owens <jcalvinowens@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nv50_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 7f0e6c3f37d1..1ddc03e51bf4 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -479,7 +479,7 @@ nv50_display_flip_wait(void *data)
{
struct nv50_display_flip *flip = data;
if (nouveau_bo_rd32(flip->disp->sync, flip->chan->addr / 4) ==
- flip->chan->data);
+ flip->chan->data)
return true;
usleep_range(1, 2);
return false;