aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-09-20 04:27:39 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-09-24 02:28:06 -0400
commit038b8b2a0dd8a0760d086f0c90af656b242369e3 (patch)
treee9bd99deb3722e125211a90c74483db22f1aadcb /drivers
parentdc7339df11bc7a90268929e57e13a14951343cc3 (diff)
drm/nv50: flush bar1 vm / dma object setup before poking 0x1708
Should fix issues noticed on NVAC (MacBook Pro / ION) since gpuobj rework. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_instmem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
index bb73c67e23b5..f5800f21a9dc 100644
--- a/drivers/gpu/drm/nouveau/nv50_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
@@ -226,6 +226,8 @@ nv50_instmem_init(struct drm_device *dev)
226 nv_wo32(priv->fb_bar, 0x10, 0x00000000); 226 nv_wo32(priv->fb_bar, 0x10, 0x00000000);
227 nv_wo32(priv->fb_bar, 0x14, 0x00000000); 227 nv_wo32(priv->fb_bar, 0x14, 0x00000000);
228 228
229 dev_priv->engine.instmem.flush(dev);
230
229 nv_wr32(dev, 0x001708, 0x80000000 | (priv->fb_bar->cinst >> 4)); 231 nv_wr32(dev, 0x001708, 0x80000000 | (priv->fb_bar->cinst >> 4));
230 for (i = 0; i < 8; i++) 232 for (i = 0; i < 8; i++)
231 nv_wr32(dev, 0x1900 + (i*4), 0); 233 nv_wr32(dev, 0x1900 + (i*4), 0);