aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv50_instmem.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-07-14 21:02:54 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-07-25 21:41:36 -0400
commit734ee8357ac2685a306acd598826d5eb8a3fca30 (patch)
tree6b09765991db71aabbac08a1e252e05de4309db0 /drivers/gpu/drm/nouveau/nv50_instmem.c
parent0edeb0c024f3af7d4dd8dde44ad1082b265ebc9a (diff)
drm/nv50: use correct PRAMIN flush register on original nv50
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_instmem.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_instmem.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
index 2a5ec887291c..2ed893cbff69 100644
--- a/drivers/gpu/drm/nouveau/nv50_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
@@ -486,6 +486,14 @@ nv50_instmem_unbind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
486void 486void
487nv50_instmem_flush(struct drm_device *dev) 487nv50_instmem_flush(struct drm_device *dev)
488{ 488{
489 nv_wr32(dev, 0x00330c, 0x00000001);
490 if (!nv_wait(0x00330c, 0x00000001, 0x00000000))
491 NV_ERROR(dev, "PRAMIN flush timeout\n");
492}
493
494void
495nv84_instmem_flush(struct drm_device *dev)
496{
489 nv_wr32(dev, 0x070000, 0x00000001); 497 nv_wr32(dev, 0x070000, 0x00000001);
490 if (!nv_wait(0x070000, 0x00000001, 0x00000000)) 498 if (!nv_wait(0x070000, 0x00000001, 0x00000000))
491 NV_ERROR(dev, "PRAMIN flush timeout\n"); 499 NV_ERROR(dev, "PRAMIN flush timeout\n");