drm/nouveau/kms/nv50-: use NVIDIA's headers for core head_olut_clr()

Ben Skeggs · Ben Skeggs · commit a66a096d7848 · 2020-07-24T18:51:02.000+10:00
Signed-off-by: Ben Skeggs &lt;bskeggs@redhat.com&gt;
Reviewed-by: Lyude Paul &lt;lyude@redhat.com&gt;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head507d.c b/drivers/gpu/drm/nouveau/dispnv50/head507d.c
@@ -256,7 +256,8 @@ head507d_olut_clr(struct nv50_head *head)
 	if ((ret = PUSH_WAIT(push, 2)))
 		return ret;
 
-	PUSH_NVSQ(push, NV507D, 0x0840 + (i * 0x400), 0x00000000);
+	PUSH_MTHD(push, NV507D, HEAD_SET_BASE_LUT_LO(i),
+		  NVDEF(NV507D, HEAD_SET_BASE_LUT_LO, ENABLE, DISABLE));
 	return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head827d.c b/drivers/gpu/drm/nouveau/dispnv50/head827d.c
@@ -91,8 +91,10 @@ head827d_olut_clr(struct nv50_head *head)
 	if ((ret = PUSH_WAIT(push, 4)))
 		return ret;
 
-	PUSH_NVSQ(push, NV827D, 0x0840 + (i * 0x400), 0x00000000);
-	PUSH_NVSQ(push, NV827D, 0x085c + (i * 0x400), 0x00000000);
+	PUSH_MTHD(push, NV827D, HEAD_SET_BASE_LUT_LO(i),
+		  NVDEF(NV827D, HEAD_SET_BASE_LUT_LO, ENABLE, DISABLE));
+
+	PUSH_MTHD(push, NV827D, HEAD_SET_CONTEXT_DMA_LUT(i), 0x00000000);
 	return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head907d.c b/drivers/gpu/drm/nouveau/dispnv50/head907d.c
@@ -220,8 +220,10 @@ head907d_olut_clr(struct nv50_head *head)
 	if ((ret = PUSH_WAIT(push, 4)))
 		return ret;
 
-	PUSH_NVSQ(push, NV907D, 0x0448 + (i * 0x300), 0x00000000);
-	PUSH_NVSQ(push, NV907D, 0x045c + (i * 0x300), 0x00000000);
+	PUSH_MTHD(push, NV907D, HEAD_SET_OUTPUT_LUT_LO(i),
+		  NVDEF(NV907D, HEAD_SET_OUTPUT_LUT_LO, ENABLE, DISABLE));
+
+	PUSH_MTHD(push, NV907D, HEAD_SET_CONTEXT_DMA_LUT(i), 0x00000000);
 	return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
@@ -143,7 +143,7 @@ headc37d_olut_clr(struct nv50_head *head)
 	if ((ret = PUSH_WAIT(push, 2)))
 		return ret;
 
-	PUSH_NVSQ(push, NVC37D, 0x20ac + (i * 0x400), 0x00000000);
+	PUSH_MTHD(push, NVC37D, HEAD_SET_CONTEXT_DMA_OUTPUT_LUT(i), 0x00000000);
 	return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc57d.c b/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
@@ -85,7 +85,7 @@ headc57d_olut_clr(struct nv50_head *head)
 	if ((ret = PUSH_WAIT(push, 2)))
 		return ret;
 
-	PUSH_NVSQ(push, NVC57D, 0x2288 + (i * 0x400), 0x00000000);
+	PUSH_MTHD(push, NVC57D, HEAD_SET_CONTEXT_DMA_OLUT(i), 0x00000000);
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,8 @@ head507d_olut_clr(struct nv50_head *head)`
`256`	`256`	`if ((ret = PUSH_WAIT(push, 2)))`
`257`	`257`	`return ret;`
`258`	`258`
`259`		`- PUSH_NVSQ(push, NV507D, 0x0840 + (i * 0x400), 0x00000000);`
	`259`	`+ PUSH_MTHD(push, NV507D, HEAD_SET_BASE_LUT_LO(i),`
	`260`	`+ NVDEF(NV507D, HEAD_SET_BASE_LUT_LO, ENABLE, DISABLE));`
`260`	`261`	`return 0;`
`261`	`262`	`}`
`262`	`263`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ headc37d_olut_clr(struct nv50_head *head)`
`143`	`143`	`if ((ret = PUSH_WAIT(push, 2)))`
`144`	`144`	`return ret;`
`145`	`145`
`146`		`- PUSH_NVSQ(push, NVC37D, 0x20ac + (i * 0x400), 0x00000000);`
	`146`	`+ PUSH_MTHD(push, NVC37D, HEAD_SET_CONTEXT_DMA_OUTPUT_LUT(i), 0x00000000);`
`147`	`147`	`return 0;`
`148`	`148`	`}`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ headc57d_olut_clr(struct nv50_head *head)`
`85`	`85`	`if ((ret = PUSH_WAIT(push, 2)))`
`86`	`86`	`return ret;`
`87`	`87`
`88`		`- PUSH_NVSQ(push, NVC57D, 0x2288 + (i * 0x400), 0x00000000);`
	`88`	`+ PUSH_MTHD(push, NVC57D, HEAD_SET_CONTEXT_DMA_OLUT(i), 0x00000000);`
`89`	`89`	`return 0;`
`90`	`90`	`}`
`91`	`91`