drm/nouveau/nvif: fix method count when pushing an array (d5022970) · Commits · EulixOS / Software / Kernel

drivers/gpu/drm/nouveau/include/nvif/push.h

+108 −108

Original line number	Diff line number	Diff line
		@@ -123,85 +123,85 @@ PUSH_KICK(struct nvif_push *push)
		} while(0)
		#endif

		#define PUSH_1(X,f,ds,n,c,o,p,s,mA,dA) do { \
		PUSH_##o##_HDR((p), s, mA, (c)+(n)); \
		#define PUSH_1(X,f,ds,n,o,p,s,mA,dA) do { \
		PUSH_##o##_HDR((p), s, mA, (ds)+(n)); \
		PUSH_##f(X, (p), X##mA, 1, o, (dA), ds, ""); \
		} while(0)
		#define PUSH_2(X,f,ds,n,c,o,p,s,mB,dB,mA,dA,a...) do { \
		#define PUSH_2(X,f,ds,n,o,p,s,mB,dB,mA,dA,a...) do { \
		PUSH_ASSERT((mB) - (mA) == (1?PUSH_##o##_INC), "mthd1"); \
		PUSH_1(X, DATA_, 1, ds, (c)+(n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_1(X, DATA_, 1, (ds) + (n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_##f(X, (p), X##mB, 0, o, (dB), ds, ""); \
		} while(0)
		#define PUSH_3(X,f,ds,n,c,o,p,s,mB,dB,mA,dA,a...) do { \
		#define PUSH_3(X,f,ds,n,o,p,s,mB,dB,mA,dA,a...) do { \
		PUSH_ASSERT((mB) - (mA) == (0?PUSH_##o##_INC), "mthd2"); \
		PUSH_2(X, DATA_, 1, ds, (c)+(n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_2(X, DATA_, 1, (ds) + (n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_##f(X, (p), X##mB, 0, o, (dB), ds, ""); \
		} while(0)
		#define PUSH_4(X,f,ds,n,c,o,p,s,mB,dB,mA,dA,a...) do { \
		#define PUSH_4(X,f,ds,n,o,p,s,mB,dB,mA,dA,a...) do { \
		PUSH_ASSERT((mB) - (mA) == (0?PUSH_##o##_INC), "mthd3"); \
		PUSH_3(X, DATA_, 1, ds, (c)+(n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_3(X, DATA_, 1, (ds) + (n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_##f(X, (p), X##mB, 0, o, (dB), ds, ""); \
		} while(0)
		#define PUSH_5(X,f,ds,n,c,o,p,s,mB,dB,mA,dA,a...) do { \
		#define PUSH_5(X,f,ds,n,o,p,s,mB,dB,mA,dA,a...) do { \
		PUSH_ASSERT((mB) - (mA) == (0?PUSH_##o##_INC), "mthd4"); \
		PUSH_4(X, DATA_, 1, ds, (c)+(n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_4(X, DATA_, 1, (ds) + (n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_##f(X, (p), X##mB, 0, o, (dB), ds, ""); \
		} while(0)
		#define PUSH_6(X,f,ds,n,c,o,p,s,mB,dB,mA,dA,a...) do { \
		#define PUSH_6(X,f,ds,n,o,p,s,mB,dB,mA,dA,a...) do { \
		PUSH_ASSERT((mB) - (mA) == (0?PUSH_##o##_INC), "mthd5"); \
		PUSH_5(X, DATA_, 1, ds, (c)+(n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_5(X, DATA_, 1, (ds) + (n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_##f(X, (p), X##mB, 0, o, (dB), ds, ""); \
		} while(0)
		#define PUSH_7(X,f,ds,n,c,o,p,s,mB,dB,mA,dA,a...) do { \
		#define PUSH_7(X,f,ds,n,o,p,s,mB,dB,mA,dA,a...) do { \
		PUSH_ASSERT((mB) - (mA) == (0?PUSH_##o##_INC), "mthd6"); \
		PUSH_6(X, DATA_, 1, ds, (c)+(n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_6(X, DATA_, 1, (ds) + (n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_##f(X, (p), X##mB, 0, o, (dB), ds, ""); \
		} while(0)
		#define PUSH_8(X,f,ds,n,c,o,p,s,mB,dB,mA,dA,a...) do { \
		#define PUSH_8(X,f,ds,n,o,p,s,mB,dB,mA,dA,a...) do { \
		PUSH_ASSERT((mB) - (mA) == (0?PUSH_##o##_INC), "mthd7"); \
		PUSH_7(X, DATA_, 1, ds, (c)+(n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_7(X, DATA_, 1, (ds) + (n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_##f(X, (p), X##mB, 0, o, (dB), ds, ""); \
		} while(0)
		#define PUSH_9(X,f,ds,n,c,o,p,s,mB,dB,mA,dA,a...) do { \
		#define PUSH_9(X,f,ds,n,o,p,s,mB,dB,mA,dA,a...) do { \
		PUSH_ASSERT((mB) - (mA) == (0?PUSH_##o##_INC), "mthd8"); \
		PUSH_8(X, DATA_, 1, ds, (c)+(n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_8(X, DATA_, 1, (ds) + (n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_##f(X, (p), X##mB, 0, o, (dB), ds, ""); \
		} while(0)
		#define PUSH_10(X,f,ds,n,c,o,p,s,mB,dB,mA,dA,a...) do { \
		#define PUSH_10(X,f,ds,n,o,p,s,mB,dB,mA,dA,a...) do { \
		PUSH_ASSERT((mB) - (mA) == (0?PUSH_##o##_INC), "mthd9"); \
		PUSH_9(X, DATA_, 1, ds, (c)+(n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_9(X, DATA_, 1, (ds) + (n), o, (p), s, X##mA, (dA), ##a); \
		PUSH_##f(X, (p), X##mB, 0, o, (dB), ds, ""); \
		} while(0)

		#define PUSH_1D(X,o,p,s,mA,dA) \
		PUSH_1(X, DATA_, 1, 1, 0, o, (p), s, X##mA, (dA))
		PUSH_1(X, DATA_, 1, 0, o, (p), s, X##mA, (dA))
		#define PUSH_2D(X,o,p,s,mA,dA,mB,dB) \
		PUSH_2(X, DATA_, 1, 1, 0, o, (p), s, X##mB, (dB), \
		PUSH_2(X, DATA_, 1, 0, o, (p), s, X##mB, (dB), \
		X##mA, (dA))
		#define PUSH_3D(X,o,p,s,mA,dA,mB,dB,mC,dC) \
		PUSH_3(X, DATA_, 1, 1, 0, o, (p), s, X##mC, (dC), \
		PUSH_3(X, DATA_, 1, 0, o, (p), s, X##mC, (dC), \
		X##mB, (dB), \
		X##mA, (dA))
		#define PUSH_4D(X,o,p,s,mA,dA,mB,dB,mC,dC,mD,dD) \
		PUSH_4(X, DATA_, 1, 1, 0, o, (p), s, X##mD, (dD), \
		PUSH_4(X, DATA_, 1, 0, o, (p), s, X##mD, (dD), \
		X##mC, (dC), \
		X##mB, (dB), \
		X##mA, (dA))
		#define PUSH_5D(X,o,p,s,mA,dA,mB,dB,mC,dC,mD,dD,mE,dE) \
		PUSH_5(X, DATA_, 1, 1, 0, o, (p), s, X##mE, (dE), \
		PUSH_5(X, DATA_, 1, 0, o, (p), s, X##mE, (dE), \
		X##mD, (dD), \
		X##mC, (dC), \
		X##mB, (dB), \
		X##mA, (dA))
		#define PUSH_6D(X,o,p,s,mA,dA,mB,dB,mC,dC,mD,dD,mE,dE,mF,dF) \
		PUSH_6(X, DATA_, 1, 1, 0, o, (p), s, X##mF, (dF), \
		PUSH_6(X, DATA_, 1, 0, o, (p), s, X##mF, (dF), \
		X##mE, (dE), \
		X##mD, (dD), \
		X##mC, (dC), \
		X##mB, (dB), \
		X##mA, (dA))
		#define PUSH_7D(X,o,p,s,mA,dA,mB,dB,mC,dC,mD,dD,mE,dE,mF,dF,mG,dG) \
		PUSH_7(X, DATA_, 1, 1, 0, o, (p), s, X##mG, (dG), \
		PUSH_7(X, DATA_, 1, 0, o, (p), s, X##mG, (dG), \
		X##mF, (dF), \
		X##mE, (dE), \
		X##mD, (dD), \
		@@ -209,7 +209,7 @@ PUSH_KICK(struct nvif_push *push)
		X##mB, (dB), \
		X##mA, (dA))
		#define PUSH_8D(X,o,p,s,mA,dA,mB,dB,mC,dC,mD,dD,mE,dE,mF,dF,mG,dG,mH,dH) \
		PUSH_8(X, DATA_, 1, 1, 0, o, (p), s, X##mH, (dH), \
		PUSH_8(X, DATA_, 1, 0, o, (p), s, X##mH, (dH), \
		X##mG, (dG), \
		X##mF, (dF), \
		X##mE, (dE), \
		@@ -218,7 +218,7 @@ PUSH_KICK(struct nvif_push *push)
		X##mB, (dB), \
		X##mA, (dA))
		#define PUSH_9D(X,o,p,s,mA,dA,mB,dB,mC,dC,mD,dD,mE,dE,mF,dF,mG,dG,mH,dH,mI,dI) \
		PUSH_9(X, DATA_, 1, 1, 0, o, (p), s, X##mI, (dI), \
		PUSH_9(X, DATA_, 1, 0, o, (p), s, X##mI, (dI), \
		X##mH, (dH), \
		X##mG, (dG), \
		X##mF, (dF), \
		@@ -228,7 +228,7 @@ PUSH_KICK(struct nvif_push *push)
		X##mB, (dB), \
		X##mA, (dA))
		#define PUSH_10D(X,o,p,s,mA,dA,mB,dB,mC,dC,mD,dD,mE,dE,mF,dF,mG,dG,mH,dH,mI,dI,mJ,dJ) \
		PUSH_10(X, DATA_, 1, 1, 0, o, (p), s, X##mJ, (dJ), \
		PUSH_10(X, DATA_, 1, 0, o, (p), s, X##mJ, (dJ), \
		X##mI, (dI), \
		X##mH, (dH), \
		X##mG, (dG), \
		@@ -240,12 +240,12 @@ PUSH_KICK(struct nvif_push *push)
		X##mA, (dA))

		#define PUSH_1P(X,o,p,s,mA,dp,ds) \
		PUSH_1(X, DATAp, ds, ds, 0, o, (p), s, X##mA, (dp))
		PUSH_1(X, DATAp, ds, 0, o, (p), s, X##mA, (dp))
		#define PUSH_2P(X,o,p,s,mA,dA,mB,dp,ds) \
		PUSH_2(X, DATAp, ds, ds, 0, o, (p), s, X##mB, (dp), \
		PUSH_2(X, DATAp, ds, 0, o, (p), s, X##mB, (dp), \
		X##mA, (dA))
		#define PUSH_3P(X,o,p,s,mA,dA,mB,dB,mC,dp,ds) \
		PUSH_3(X, DATAp, ds, ds, 0, o, (p), s, X##mC, (dp), \
		PUSH_3(X, DATAp, ds, 0, o, (p), s, X##mC, (dp), \
		X##mB, (dB), \
		X##mA, (dA))