Commit 2f819f2b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: convert core head_dither() to new push macros 



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

drivers/gpu/drm/nouveau/dispnv50/head.h

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct nv50_head_func { 
	int (*curs_clr)(struct nv50_head *);

	int (*base)(struct nv50_head *, struct nv50_head_atom *);

	int (*ovly)(struct nv50_head *, struct nv50_head_atom *);

	void (*dither)(struct nv50_head *, struct nv50_head_atom *);

	int (*dither)(struct nv50_head *, struct nv50_head_atom *);

	void (*procamp)(struct nv50_head *, struct nv50_head_atom *);

	void (*or)(struct nv50_head *, struct nv50_head_atom *);

	void (*static_wndw_map)(struct nv50_head *, struct nv50_head_atom *);
@@ -61,7 +61,7 @@ int head507d_curs_format(struct nv50_head *, struct nv50_wndw_atom *, 
			 struct nv50_head_atom *);

int head507d_base(struct nv50_head *, struct nv50_head_atom *);

int head507d_ovly(struct nv50_head *, struct nv50_head_atom *);

void head507d_dither(struct nv50_head *, struct nv50_head_atom *);

int head507d_dither(struct nv50_head *, struct nv50_head_atom *);

void head507d_procamp(struct nv50_head *, struct nv50_head_atom *);



extern const struct nv50_head_func head827d;
@@ -90,7 +90,7 @@ int headc37d_curs_format(struct nv50_head *, struct nv50_wndw_atom *, 
			 struct nv50_head_atom *);

int headc37d_curs_set(struct nv50_head *, struct nv50_head_atom *);

int headc37d_curs_clr(struct nv50_head *);

void headc37d_dither(struct nv50_head *, struct nv50_head_atom *);

int headc37d_dither(struct nv50_head *, struct nv50_head_atom *);

void headc37d_static_wndw_map(struct nv50_head *, struct nv50_head_atom *);



extern const struct nv50_head_func headc57d;

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

+12 −10
Original line number Diff line number Diff line
@@ -37,18 +37,20 @@ head507d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh) 
	}

}



void

int

head507d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)

{

	struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;

	u32 *push;

	if ((push = evo_wait(core, 2))) {

		evo_mthd(push, 0x08a0 + (head->base.index * 0x0400), 1);

		evo_data(push, asyh->dither.mode << 3 |

	struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;

	const int i = head->base.index;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))

		return ret;



	PUSH_NVSQ(push, NV507D, 0x08a0 + (i * 0x400), asyh->dither.mode << 3 |

						      asyh->dither.bits << 1 |

						      asyh->dither.enable);

		evo_kick(push, core);

	}

	return 0;

}



int

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

+12 −10
Original line number Diff line number Diff line
@@ -61,18 +61,20 @@ head907d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh) 
	}

}



static void

static int

head907d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)

{

	struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;

	u32 *push;

	if ((push = evo_wait(core, 2))) {

		evo_mthd(push, 0x0490 + (head->base.index * 0x0300), 1);

		evo_data(push, asyh->dither.mode << 3 |

	struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;

	const int i = head->base.index;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))

		return ret;



	PUSH_NVSQ(push, NV907D, 0x0490 + (i * 0x300), asyh->dither.mode << 3 |

						      asyh->dither.bits << 1 |

						      asyh->dither.enable);

		evo_kick(push, core);

	}

	return 0;

}



int

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

+12 −10
Original line number Diff line number Diff line
@@ -24,18 +24,20 @@ 


#include <nvif/push507c.h>



static void

static int

head917d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)

{

	struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;

	u32 *push;

	if ((push = evo_wait(core, 2))) {

		evo_mthd(push, 0x04a0 + (head->base.index * 0x0300), 1);

		evo_data(push, asyh->dither.mode << 3 |

	struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;

	const int i = head->base.index;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))

		return ret;



	PUSH_NVSQ(push, NV917D, 0x04a0 + (i * 0x300), asyh->dither.mode << 3 |

						      asyh->dither.bits << 1 |

						      asyh->dither.enable);

		evo_kick(push, core);

	}

	return 0;

}



static int

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

+12 −10
Original line number Diff line number Diff line
@@ -70,18 +70,20 @@ headc37d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh) 
	}

}



void

int

headc37d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)

{

	struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;

	u32 *push;

	if ((push = evo_wait(core, 2))) {

		evo_mthd(push, 0x2018 + (head->base.index * 0x0400), 1);

		evo_data(push, asyh->dither.mode << 8 |

	struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;

	const int i = head->base.index;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))

		return ret;



	PUSH_NVSQ(push, NV907D, 0x2018 + (i * 0x400), asyh->dither.mode << 8 |

						      asyh->dither.bits << 4 |

						      asyh->dither.enable);

		evo_kick(push, core);

	}

	return 0;

}



int