Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bb3f6a2 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



Reported-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent bf03d1b2

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

{

	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 ttm_mem_reg *old_mem = &bo->mem;

	int ret;
@@ -1052,6 +1052,7 @@ nouveau_bo_move_init(struct nouveau_drm *drm) 
			}



			drm->ttm.move = mthd->exec;

			drm->ttm.chan = chan;

			name = mthd->name;

			break;

		}

drivers/gpu/drm/nouveau/nouveau_drm.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ struct nouveau_drm { 
		int (*move)(struct nouveau_channel *,

			    struct ttm_buffer_object *,

			    struct ttm_mem_reg *, struct ttm_mem_reg *);

		struct nouveau_channel *chan;

		int mtrr;

	} ttm;