drm/nv50: implement possible workaround for NV86 PGRAPH TLB flush hang
authorBen Skeggs <bskeggs@redhat.com>
Fri, 22 Oct 2010 00:26:24 +0000 (10:26 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 18 Nov 2010 04:38:45 +0000 (14:38 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_mem.c
drivers/gpu/drm/nouveau/nouveau_sgdma.c
drivers/gpu/drm/nouveau/nouveau_state.c
drivers/gpu/drm/nouveau/nv50_fifo.c
drivers/gpu/drm/nouveau/nv50_graph.c
drivers/gpu/drm/nouveau/nv50_instmem.c

Simple merge
Simple merge
Simple merge
Simple merge