iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau/vm: perform a bar flush when flushing vm

Browse Source 
Appears to fix the regression from "drm/nvc0/vm: handle bar tlb flushes
internally".

nvidia always seems to do this flush after writing values.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Maarten Lankhorst 2013-06-11 14:17:25 +02:00 committed by Ben Skeggs
parent 57f0ec159b
commit 36798b61ed
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/core/subdev/vm/nv50.c
View File

@ -27,6 +27,7 @@
#include <subdev/timer.h> #include <subdev/timer.h>
#include <subdev/fb.h> #include <subdev/fb.h>
#include <subdev/bar.h>
#include <subdev/vm.h> #include <subdev/vm.h>
struct nv50_vmmgr_priv { struct nv50_vmmgr_priv {
@ -151,9 +152,12 @@ static void
nv50_vm_flush(struct nouveau_vm *vm) nv50_vm_flush(struct nouveau_vm *vm)
{ {
struct nv50_vmmgr_priv *priv = (void *)vm->vmm; struct nv50_vmmgr_priv *priv = (void *)vm->vmm;
struct nouveau_bar *bar = nouveau_bar(priv);
struct nouveau_engine *engine; struct nouveau_engine *engine;
int i, vme; int i, vme;
bar->flush(bar);
mutex_lock(&nv_subdev(priv)->mutex); mutex_lock(&nv_subdev(priv)->mutex);
for (i = 0; i < NVDEV_SUBDEV_NR; i++) { for (i = 0; i < NVDEV_SUBDEV_NR; i++) {
if (!atomic_read(&vm->engref[i])) if (!atomic_read(&vm->engref[i]))

4
drivers/gpu/drm/nouveau/core/subdev/vm/nvc0.c
View File

@ -29,6 +29,7 @@
#include <subdev/fb.h> #include <subdev/fb.h>
#include <subdev/vm.h> #include <subdev/vm.h>
#include <subdev/ltcg.h> #include <subdev/ltcg.h>
#include <subdev/bar.h>
struct nvc0_vmmgr_priv { struct nvc0_vmmgr_priv {
struct nouveau_vmmgr base; struct nouveau_vmmgr base;
@ -163,9 +164,12 @@ static void
nvc0_vm_flush(struct nouveau_vm *vm) nvc0_vm_flush(struct nouveau_vm *vm)
{ {
struct nvc0_vmmgr_priv *priv = (void *)vm->vmm; struct nvc0_vmmgr_priv *priv = (void *)vm->vmm;
struct nouveau_bar *bar = nouveau_bar(priv);
struct nouveau_vm_pgd *vpgd; struct nouveau_vm_pgd *vpgd;
u32 type; u32 type;
bar->flush(bar);
type = 0x00000001; /* PAGE_ALL */ type = 0x00000001; /* PAGE_ALL */
if (atomic_read(&vm->engref[NVDEV_SUBDEV_BAR])) if (atomic_read(&vm->engref[NVDEV_SUBDEV_BAR]))
type |= 0x00000004; /* HUB_ONLY */ type |= 0x00000004; /* HUB_ONLY */