OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4417be5
)
drm/nouveau/pwr: wait for scrubbers to finish before uploading new ucode
author
Ben Skeggs
<bskeggs@redhat.com>
Mon, 18 Aug 2014 02:41:57 +0000
(12:41 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Mon, 15 Sep 2014 12:24:58 +0000
(22:24 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/core/subdev/pwr/base.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/core/subdev/pwr/base.c
b/drivers/gpu/drm/nouveau/core/subdev/pwr/base.c
index
477c9a2
..
0ab55f2
100644
(file)
--- a/
drivers/gpu/drm/nouveau/core/subdev/pwr/base.c
+++ b/
drivers/gpu/drm/nouveau/core/subdev/pwr/base.c
@@
-203,9
+203,8
@@
_nouveau_pwr_init(struct nouveau_object *object)
nv_wait(ppwr, 0x10a04c, 0xffffffff, 0x00000000);
nv_mask(ppwr, 0x000200, 0x00002000, 0x00000000);
nv_mask(ppwr, 0x000200, 0x00002000, 0x00002000);
-
- /* At least one GM107 needs this delay after reset */
- udelay(20);
+ nv_rd32(ppwr, 0x000200);
+ nv_wait(ppwr, 0x10a10c, 0x00000006, 0x00000000);
/* upload data segment */
nv_wr32(ppwr, 0x10a1c0, 0x01000000);