diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-07-15 11:02:54 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-26 11:41:36 +1000 |
commit | 734ee8357ac2685a306acd598826d5eb8a3fca30 (patch) | |
tree | 6b09765991db71aabbac08a1e252e05de4309db0 /drivers/gpu/drm/nouveau/nv50_instmem.c | |
parent | 0edeb0c024f3af7d4dd8dde44ad1082b265ebc9a (diff) | |
download | talos-op-linux-734ee8357ac2685a306acd598826d5eb8a3fca30.tar.gz talos-op-linux-734ee8357ac2685a306acd598826d5eb8a3fca30.zip |
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.c | 8 |
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) void nv50_instmem_flush(struct drm_device *dev) { + nv_wr32(dev, 0x00330c, 0x00000001); + if (!nv_wait(0x00330c, 0x00000001, 0x00000000)) + NV_ERROR(dev, "PRAMIN flush timeout\n"); +} + +void +nv84_instmem_flush(struct drm_device *dev) +{ nv_wr32(dev, 0x070000, 0x00000001); if (!nv_wait(0x070000, 0x00000001, 0x00000000)) NV_ERROR(dev, "PRAMIN flush timeout\n"); |