aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2017-03-28 11:46:37 +1000
committerBen Skeggs <bskeggs@redhat.com>2017-05-12 08:32:53 +1000
commit80a92865f2113fe8bc268218b0c4156cfab4c9ac (patch)
treec0738be65b3e4ce1564171826141a9901f19df3f
parentdrm/nouveau/kms/nv50: skip core channel cursor update on position-only changes (diff)
downloadlinux-dev-80a92865f2113fe8bc268218b0c4156cfab4c9ac.tar.xz
linux-dev-80a92865f2113fe8bc268218b0c4156cfab4c9ac.zip
drm/nouveau/fb/ram/gf100-: remove 0x10f200 read
This reg has moved on Pascal, and causes a bus fault. We never use the value anyway, so just remove the read. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c
index c63975907c90..4a9bd4f1cb93 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c
@@ -638,7 +638,6 @@ gf100_ram_ctor(const struct nvkm_ram_func *func, struct nvkm_fb *fb,
return ret;
}
- ram->ranks = (nvkm_rd32(device, 0x10f200) & 0x00000004) ? 2 : 1;
return 0;
}