git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'kumar/merge' into merge
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nv50_crtc.c
diff --git
a/drivers/gpu/drm/nouveau/nv50_crtc.c
b/drivers/gpu/drm/nouveau/nv50_crtc.c
index
2b99840
..
a19ccaa
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nv50_crtc.c
+++ b/
drivers/gpu/drm/nouveau/nv50_crtc.c
@@
-469,9
+469,6
@@
nv50_crtc_wait_complete(struct drm_crtc *crtc)
start = ptimer->read(dev);
do {
- nv_wr32(dev, 0x61002c, 0x370);
- nv_wr32(dev, 0x000140, 1);
-
if (nv_ro32(disp->ntfy, 0x000))
return 0;
} while (ptimer->read(dev) - start < 2000000000ULL);