projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
15ee005
)
drm/nouveau/clk/gt215: Unbreak engine pausing for GT21x/MCP7x
author
Roy Spliet
<rspliet@eclipso.eu>
Wed, 2 Sep 2015 22:21:02 +0000
(23:21 +0100)
committer
Ben Skeggs
<bskeggs@redhat.com>
Fri, 11 Sep 2015 01:29:14 +0000
(11:29 +1000)
Typo that snuck in with commit
6979c6303a4abf263753cd9d577d79f05c6e8c47
Signed-off-by: Roy Spliet <rspliet@eclipso.eu>
Reported-by: Pierre Moreau <pierre.morrow@free.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
index 07feae620c8d9f301e103a030d5ffb23c8e2120a..c233e3f653ce23168a579c36e07d153182333021 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
+++ b/
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
@@
-326,7
+326,7
@@
gt215_clk_pre(struct nvkm_clk *clk, unsigned long *flags)
return -EIO;
if (nvkm_msec(device, 2000,
- u32 tmp = nvkm_rd32(device, 0x0025
04
) & 0x0000003f;
+ u32 tmp = nvkm_rd32(device, 0x0025
1c
) & 0x0000003f;
if (tmp == 0x0000003f)
break;
) < 0)