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

Commit 8609cb8e authored by Karol Herbst's avatar Karol Herbst Committed by Ben Skeggs
Browse files

drm/nouveau/pmu/fuc: use the call macro instead of using the call instruction directly 



the macro deals with target specific differences and so we should always use
this

Signed-off-by: default avatarKarol Herbst <nouveau@karolherbst.de>
Reviewed-by: default avatarMartin Peres <martin.peres@free.fr>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 70d97b51

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h

+6 −6
Original line number Diff line number Diff line
@@ -1036,20 +1036,20 @@ uint32_t gk208_pmu_code[] = { 
/* 0x0193: ticks_from_ns */

	0xf901f800,

	0x4db0f9c0,

	0x21f50144,

	0xccec0352,

	0x527e0144,

	0xccec0003,

	0xb4b003e8,

	0x0e0bf400,

	0x03e8eeec,

	0xf501444d,

	0x7e01444d,

/* 0x01b3: ticks_from_ns_quit */

	0xb2035221,

	0xb2000352,

	0xfcb0fcce,

/* 0x01bb: ticks_from_us */

	0xf900f8c0,

	0x4db0f9c0,

	0x21f50144,

	0xceb20352,

	0x527e0144,

	0xceb20003,

	0xf400b4b0,

	0xe4bd050b,

/* 0x01d0: ticks_from_us_quit */

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/kernel.fuc

+3 −3
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ ticks_from_ns: 


	/* try not losing precision (multiply then divide) */

	imm32($r13, HW_TICKS_PER_US)

	call #mulu32_32_64

	call(mulu32_32_64)



	/* use an immeditate, it's ok because HW_TICKS_PER_US < 16 bits */

	div $r12 $r12 1000
@@ -264,7 +264,7 @@ ticks_from_ns: 
	/* let's divide then multiply, too bad for the precision! */

	div $r14 $r14 1000

	imm32($r13, HW_TICKS_PER_US)

	call #mulu32_32_64

	call(mulu32_32_64)



	/* this cannot overflow as long as HW_TICKS_PER_US < 1000 */
@@ -286,7 +286,7 @@ ticks_from_us: 


	/* simply multiply $us by HW_TICKS_PER_US */

	imm32($r13, HW_TICKS_PER_US)

	call #mulu32_32_64

	call(mulu32_32_64)

	mov b32 $r14 $r12



	/* check if there wasn't any overflow */