Commit 246db5fd authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



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

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

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

	int (*ovly)(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 *);

	int (*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 *);

};
@@ -62,7 +62,7 @@ int head507d_curs_format(struct nv50_head *, struct nv50_wndw_atom *, 
int head507d_base(struct nv50_head *, struct nv50_head_atom *);

int head507d_ovly(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 *);

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



extern const struct nv50_head_func head827d;
@@ -77,7 +77,7 @@ int head907d_core_clr(struct nv50_head *); 
int head907d_curs_set(struct nv50_head *, struct nv50_head_atom *);

int head907d_curs_clr(struct nv50_head *);

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

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

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

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



extern const struct nv50_head_func head917d;

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

+11 −9
Original line number Diff line number Diff line
@@ -24,17 +24,19 @@ 


#include <nvif/push507c.h>



void

int

head507d_procamp(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, 0x08a8 + (head->base.index * 0x400), 1);

		evo_data(push, asyh->procamp.sat.sin << 20 |

	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, 0x08a8 + (i * 0x400), asyh->procamp.sat.sin << 20 |

						      asyh->procamp.sat.cos << 8);

		evo_kick(push, core);

	}

	return 0;

}



int

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

+11 −9
Original line number Diff line number Diff line
@@ -48,17 +48,19 @@ head907d_or(struct nv50_head *head, struct nv50_head_atom *asyh) 
	}

}



void

int

head907d_procamp(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, 0x0498 + (head->base.index * 0x300), 1);

		evo_data(push, asyh->procamp.sat.sin << 20 |

	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, 0x0498 + (i * 0x300), asyh->procamp.sat.sin << 20 |

						      asyh->procamp.sat.cos << 8);

		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
@@ -56,18 +56,20 @@ headc37d_or(struct nv50_head *head, struct nv50_head_atom *asyh) 
	}

}



static void

static int

headc37d_procamp(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, 0x2000 + (head->base.index * 0x400), 1);

		evo_data(push, 0x80000000 |

	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, NVC37D, 0x2000 + (i * 0x400), 0x80000000 |

						      asyh->procamp.sat.sin << 16 |

						      asyh->procamp.sat.cos << 4);

		evo_kick(push, core);

	}

	return 0;

}



int

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

+11 −14
Original line number Diff line number Diff line
@@ -57,22 +57,19 @@ headc57d_or(struct nv50_head *head, struct nv50_head_atom *asyh) 
	}

}



static void

static int

headc57d_procamp(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, 0x2000 + (head->base.index * 0x400), 1);

#if 0

		evo_data(push, 0x80000000 |

			       asyh->procamp.sat.sin << 16 |

			       asyh->procamp.sat.cos << 4);

#else

		evo_data(push, 0);

#endif

		evo_kick(push, core);

	}

	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;



	//TODO:

	PUSH_NVSQ(push, NVC57D, 0x2000 + (i * 0x400), 0x00000000);

	return 0;

}



static int