Commit 85bdfcd4 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: convert wndw blend_set() to new push macros 



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

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

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct nv50_wndw_func { 
	int (*image_set)(struct nv50_wndw *, struct nv50_wndw_atom *);

	int (*image_clr)(struct nv50_wndw *);

	int (*scale_set)(struct nv50_wndw *, struct nv50_wndw_atom *);

	void (*blend_set)(struct nv50_wndw *, struct nv50_wndw_atom *);

	int (*blend_set)(struct nv50_wndw *, struct nv50_wndw_atom *);



	void (*update)(struct nv50_wndw *, u32 *interlock);

};
@@ -123,7 +123,7 @@ int wndwc37e_sema_clr(struct nv50_wndw *); 
int wndwc37e_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *);

int wndwc37e_ntfy_clr(struct nv50_wndw *);

int wndwc37e_image_clr(struct nv50_wndw *);

void wndwc37e_blend_set(struct nv50_wndw *, struct nv50_wndw_atom *);

int wndwc37e_blend_set(struct nv50_wndw *, struct nv50_wndw_atom *);

void wndwc37e_update(struct nv50_wndw *, u32 *);



int wndwc57e_new(struct nouveau_drm *, enum drm_plane_type, int, s32,

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

+18 −16
Original line number Diff line number Diff line
@@ -92,24 +92,26 @@ wndwc37e_ilut(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw, int size) 
	return true;

}



void

int

wndwc37e_blend_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	u32 *push;

	if ((push = evo_wait(&wndw->wndw, 8))) {

		evo_mthd(push, 0x02ec, 7);

		evo_data(push, asyw->blend.depth << 4);

		evo_data(push, asyw->blend.k1);

		evo_data(push, asyw->blend.dst_color << 12 |

	struct nvif_push *push = wndw->wndw.push;

	int ret;



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

		return ret;



	PUSH_NVSQ(push, NVC37E, 0x02ec, asyw->blend.depth << 4,

				0x02f0, asyw->blend.k1,

				0x02f4, asyw->blend.dst_color << 12 |

					asyw->blend.dst_color << 8 |

					asyw->blend.src_color << 4 |

			       asyw->blend.src_color);

		evo_data(push, 0xffff0000);

		evo_data(push, 0xffff0000);

		evo_data(push, 0xffff0000);

		evo_data(push, 0xffff0000);

		evo_kick(push, &wndw->wndw);

	}

					asyw->blend.src_color,

				0x02f8, 0xffff0000,

				0x02fc, 0xffff0000,

				0x0300, 0xffff0000,

				0x0304, 0xffff0000);

	return 0;

}



int

CRA Git | Maintained and supported by SUSTech CRA and CCSE