hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau: fix minor thinko causing bo moves to not be async on kepler 

Reported-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2013-07-08 10:40:35 +10:00
parent bf03d1b293
commit 1bb3f6a252
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@ -968,7 +968,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
bool no_wait_gpu, struct ttm_mem_reg *new_mem) bool no_wait_gpu, struct ttm_mem_reg *new_mem)
{ {
struct nouveau_drm *drm = nouveau_bdev(bo->bdev); struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
struct nouveau_channel *chan = chan = drm->channel; struct nouveau_channel *chan = chan = drm->ttm.chan;
struct nouveau_bo *nvbo = nouveau_bo(bo); struct nouveau_bo *nvbo = nouveau_bo(bo);
struct ttm_mem_reg *old_mem = &bo->mem; struct ttm_mem_reg *old_mem = &bo->mem;
int ret; int ret;
@ -1052,6 +1052,7 @@ nouveau_bo_move_init(struct nouveau_drm *drm)
} }
drm->ttm.move = mthd->exec; drm->ttm.move = mthd->exec;
drm->ttm.chan = chan;
name = mthd->name; name = mthd->name;
break; break;
} }

1
drivers/gpu/drm/nouveau/nouveau_drm.h
View File

@ -96,6 +96,7 @@ struct nouveau_drm {
int (*move)(struct nouveau_channel *, int (*move)(struct nouveau_channel *,
struct ttm_buffer_object *, struct ttm_buffer_object *,
struct ttm_mem_reg *, struct ttm_mem_reg *); struct ttm_mem_reg *, struct ttm_mem_reg *);
struct nouveau_channel *chan;
int mtrr; int mtrr;
} ttm; } ttm;