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

Commit 542f60dc authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/timer: re-introduce nvkm_wait_xsec macros 



Reintroduce macros allowing us to test a register against a certain
mask, since this is the most common usage pattern for the more generic
nvkm_xsec macros and makes the code more concise and readable.

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

drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h

+10 −0
Original line number Diff line number Diff line
@@ -59,6 +59,16 @@ void nvkm_timer_alarm_cancel(struct nvkm_timer *, struct nvkm_alarm *); 
#define nvkm_usec(d,u,cond...) nvkm_nsec((d), (u) * 1000, ##cond)

#define nvkm_msec(d,m,cond...) nvkm_usec((d), (m) * 1000, ##cond)



#define nvkm_wait_nsec(d,n,addr,mask,data)                                     \

	nvkm_nsec(d, n,                                                        \

		if ((nvkm_rd32(d, (addr)) & (mask)) == (data))                 \

			break;                                                 \

		)

#define nvkm_wait_usec(d,u,addr,mask,data)                                     \

	nvkm_wait_nsec((d), (u) * 1000, (addr), (mask), (data))

#define nvkm_wait_msec(d,m,addr,mask,data)                                     \

	nvkm_wait_usec((d), (m) * 1000, (addr), (mask), (data))



int nv04_timer_new(struct nvkm_device *, int, struct nvkm_timer **);

int nv40_timer_new(struct nvkm_device *, int, struct nvkm_timer **);

int nv41_timer_new(struct nvkm_device *, int, struct nvkm_timer **);