git.samba.org
/
jlayton
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau...
[jlayton/linux.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nv50_display.c
diff --git
a/drivers/gpu/drm/nouveau/nv50_display.c
b/drivers/gpu/drm/nouveau/nv50_display.c
index e843cf86bccec036c312e76ad912e51c8642f3f6..dd5e01f89f284cd8aaf9df8b830816092055dc8b 100644
(file)
--- 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;