summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorRoy Spliet <rspliet@eclipso.eu>2015-09-03 00:21:02 +0200
committerBen Skeggs <bskeggs@redhat.com>2015-09-11 03:29:14 +0200
commitc5bf4609e03e296d74cbbfe124ba49e0f907feb3 (patch)
tree6e5e7e9527eb43befc0416bb95e0efa951b48b92 /drivers/gpu
parentdrm/nouveau/gr/nv04: fix big endian setting on gr context (diff)
downloadlinux-c5bf4609e03e296d74cbbfe124ba49e0f907feb3.tar.xz
linux-c5bf4609e03e296d74cbbfe124ba49e0f907feb3.zip
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.c2
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)
return -EIO;
if (nvkm_msec(device, 2000,
- u32 tmp = nvkm_rd32(device, 0x002504) & 0x0000003f;
+ u32 tmp = nvkm_rd32(device, 0x00251c) & 0x0000003f;
if (tmp == 0x0000003f)
break;
) < 0)