diff options
| author | Roy Spliet <rspliet@eclipso.eu> | 2015-09-02 18:21:02 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-09-10 21:29:14 -0400 |
| commit | c5bf4609e03e296d74cbbfe124ba49e0f907feb3 (patch) | |
| tree | 6e5e7e9527eb43befc0416bb95e0efa951b48b92 /drivers/gpu | |
| parent | 15ee005893c5ac8aabb66c2ad0033ef31dbdcfa3 (diff) | |
drm/nouveau/clk/gt215: Unbreak engine pausing for GT21x/MCP7x
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c index 07feae620c8d..c233e3f653ce 100644 --- 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) | |||
| 326 | return -EIO; | 326 | return -EIO; |
| 327 | 327 | ||
| 328 | if (nvkm_msec(device, 2000, | 328 | if (nvkm_msec(device, 2000, |
| 329 | u32 tmp = nvkm_rd32(device, 0x002504) & 0x0000003f; | 329 | u32 tmp = nvkm_rd32(device, 0x00251c) & 0x0000003f; |
| 330 | if (tmp == 0x0000003f) | 330 | if (tmp == 0x0000003f) |
| 331 | break; | 331 | break; |
| 332 | ) < 0) | 332 | ) < 0) |