Commit 916722fc authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent ed0b86a9

drivers/gpu/drm/nouveau/dispnv50/head507d.c

+4 −1
Original line number Diff line number Diff line
@@ -123,7 +123,10 @@ head507d_curs_clr(struct nv50_head *head) 
	if ((ret = PUSH_WAIT(push, 2)))

		return ret;



	PUSH_NVSQ(push, NV507D, 0x0880 + (i * 0x400), 0x05000000);

	PUSH_MTHD(push, NV507D, HEAD_SET_CONTROL_CURSOR(i),

		  NVDEF(NV507D, HEAD_SET_CONTROL_CURSOR, ENABLE, DISABLE) |

		  NVDEF(NV507D, HEAD_SET_CONTROL_CURSOR, FORMAT, A8R8G8B8) |

		  NVDEF(NV507D, HEAD_SET_CONTROL_CURSOR, SIZE, W64_H64));

	return 0;

}

drivers/gpu/drm/nouveau/dispnv50/head827d.c

+6 −2
Original line number Diff line number Diff line
@@ -36,8 +36,12 @@ head827d_curs_clr(struct nv50_head *head) 
	if ((ret = PUSH_WAIT(push, 4)))

		return ret;



	PUSH_NVSQ(push, NV827D, 0x0880 + (i * 0x400), 0x05000000);

	PUSH_NVSQ(push, NV827D, 0x089c + (i * 0x400), 0x00000000);

	PUSH_MTHD(push, NV827D, HEAD_SET_CONTROL_CURSOR(i),

		  NVDEF(NV827D, HEAD_SET_CONTROL_CURSOR, ENABLE, DISABLE) |

		  NVDEF(NV827D, HEAD_SET_CONTROL_CURSOR, FORMAT, A8R8G8B8) |

		  NVDEF(NV827D, HEAD_SET_CONTROL_CURSOR, SIZE, W64_H64));



	PUSH_MTHD(push, NV827D, HEAD_SET_CONTEXT_DMA_CURSOR(i), 0x00000000);

	return 0;

}

drivers/gpu/drm/nouveau/dispnv50/head907d.c

+6 −2
Original line number Diff line number Diff line
@@ -151,8 +151,12 @@ head907d_curs_clr(struct nv50_head *head) 
	if ((ret = PUSH_WAIT(push, 4)))

		return ret;



	PUSH_NVSQ(push, NV907D, 0x0480 + (i * 0x300), 0x05000000);

	PUSH_NVSQ(push, NV907D, 0x048c + (i * 0x300), 0x00000000);

	PUSH_MTHD(push, NV907D, HEAD_SET_CONTROL_CURSOR(i),

		  NVDEF(NV907D, HEAD_SET_CONTROL_CURSOR, ENABLE, DISABLE) |

		  NVDEF(NV907D, HEAD_SET_CONTROL_CURSOR, FORMAT, A8R8G8B8) |

		  NVDEF(NV907D, HEAD_SET_CONTROL_CURSOR, SIZE, W64_H64));



	PUSH_MTHD(push, NV907D, HEAD_SET_CONTEXT_DMA_CURSOR(i), 0x00000000);

	return 0;

}

drivers/gpu/drm/nouveau/dispnv50/headc37d.c

+5 −2
Original line number Diff line number Diff line
@@ -101,8 +101,11 @@ headc37d_curs_clr(struct nv50_head *head) 
	if ((ret = PUSH_WAIT(push, 4)))

		return ret;



	PUSH_NVSQ(push, NVC37D, 0x209c + (i * 0x400), 0x000000cf);

	PUSH_NVSQ(push, NVC37D, 0x2088 + (i * 0x400), 0x00000000);

	PUSH_MTHD(push, NVC37D, HEAD_SET_CONTROL_CURSOR(i),

		  NVDEF(NVC37D, HEAD_SET_CONTROL_CURSOR, ENABLE, DISABLE) |

		  NVDEF(NVC37D, HEAD_SET_CONTROL_CURSOR, FORMAT, A8R8G8B8));



	PUSH_MTHD(push, NVC37D, HEAD_SET_CONTEXT_DMA_CURSOR(i, 0), 0x00000000);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE