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

Commit 65d9376b authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/falcon: use NXTCTX register instead of NEW_INSTBLK 



Both registers allow to bind a new context, but NXTCTX will work on all
falcons, while legacy NEW_INSTBLK is reserved to PMU.

After setting NXTCTX we trigger a context switch by writing 0x090 and
0x0a4.

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 1106459e

drivers/gpu/drm/nouveau/nvkm/falcon/v1.c

+4 −1
Original line number Diff line number Diff line
@@ -149,9 +149,12 @@ nvkm_falcon_v1_bind_context(struct nvkm_falcon *falcon, struct nvkm_gpuobj *ctx) 


	/* Enable context */

	nvkm_falcon_mask(falcon, 0x048, 0x1, 0x1);

	nvkm_falcon_wr32(falcon, 0x480,

	nvkm_falcon_wr32(falcon, 0x054,

			 ((ctx->addr >> 12) & 0xfffffff) |

			 (inst_loc << 28) | (1 << 30));



	nvkm_falcon_mask(falcon, 0x090, 0x10000, 0x10000);

	nvkm_falcon_mask(falcon, 0x0a4, 0x8, 0x8);

}



static void