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

Commit 2863204c authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/disp/gm200-: allow non-identity mapping of SOR <-> macro links 



Finally, everything should be in place to handle this.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0d93cd92

drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ nvkm_outp_acquire(struct nvkm_outp *outp, u8 user) 
	/* Failing that, a completely unused OR is the next best thing. */

	list_for_each_entry(ior, &outp->disp->ior, head) {

		if (!ior->asy.outp && ior->type == type && !ior->arm.outp &&

		    ior->id == __ffs(outp->info.or))

		    (ior->func->route.set || ior->id == __ffs(outp->info.or)))

			return nvkm_outp_acquire_ior(outp, user, ior);

	}
@@ -146,7 +146,7 @@ nvkm_outp_acquire(struct nvkm_outp *outp, u8 user) 
	 */

	list_for_each_entry(ior, &outp->disp->ior, head) {

		if (!ior->asy.outp && ior->type == type &&

		    ior->id == __ffs(outp->info.or))

		    (ior->func->route.set || ior->id == __ffs(outp->info.or)))

			return nvkm_outp_acquire_ior(outp, user, ior);

	}