diff options
| author |   Dave Airlie <airlied@redhat.com> | 2011-04-11 15:26:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-04-11 15:26:01 +1000 |
| commit | d85023a3cdb48ae127e431ec216c277ed7a3cb0f (patch) | |
| tree | e957a70646c1770ffe78ae793ca50a91254aeee0 /drivers/gpu/drm/nouveau/nv50_graph.c | |
| parent | drm/radeon/kms: make radeon i2c put/get bytes less noisy (diff) | |
| parent | drm/nvc0: improve vm flush function (diff) | |
| download | linux-dev-d85023a3cdb48ae127e431ec216c277ed7a3cb0f.tar.xz linux-dev-d85023a3cdb48ae127e431ec216c277ed7a3cb0f.zip | |
Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into drm-fixes
* 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next:
drm/nvc0: improve vm flush function
drm/nv50-nvc0: remove some code that doesn't belong here
drm/nv50: use "nv86" tlb flush method on everything except 0x50/0xac
drm/nouveau: quirk for XFX GT-240X-YA
drm/nv50-nvc0: work around an evo channel hang that some people see
drm/nouveau: implement init table opcode 0x5c
drm/nouveau: fix oops on unload with disabled LVDS panel
nv30: Fix parsing of perf table
drm/nouveau: correct memtiming table parsing for nv4x
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_graph.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index 8675b00caf18..b02a5b1e7d37 100644 --- a/drivers/gpu/drm/nouveau/nv50_graph.c +++ b/drivers/gpu/drm/nouveau/nv50_graph.c @@ -503,7 +503,7 @@ nv50_graph_tlb_flush(struct drm_device *dev) } void -nv86_graph_tlb_flush(struct drm_device *dev) +nv84_graph_tlb_flush(struct drm_device *dev) { struct drm_nouveau_private *dev_priv = dev->dev_private; struct nouveau_timer_engine *ptimer = &dev_priv->engine.timer; |