Commit 0a4693e8 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ int ovly507e_acquire(struct nv50_wndw *, struct nv50_wndw_atom *, 
		     struct nv50_head_atom *);

void ovly507e_release(struct nv50_wndw *, struct nv50_wndw_atom *,

		      struct nv50_head_atom *);

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

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

void ovly507e_update(struct nv50_wndw *, u32 *);



extern const u32 ovly827e_format[];

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

+11 −9
Original line number Diff line number Diff line
@@ -41,17 +41,19 @@ ovly507e_update(struct nv50_wndw *wndw, u32 *interlock) 
	}

}



void

int

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

{

	u32 *push;

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

		evo_mthd(push, 0x00e0, 3);

		evo_data(push, asyw->scale.sy << 16 | asyw->scale.sx);

		evo_data(push, asyw->scale.sh << 16 | asyw->scale.sw);

		evo_data(push, asyw->scale.dw);

		evo_kick(push, &wndw->wndw);

	}

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

	int ret;



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

		return ret;



	PUSH_NVSQ(push, NV507E, 0x00e0, asyw->scale.sy << 16 | asyw->scale.sx,

				0x00e4, asyw->scale.sh << 16 | asyw->scale.sw,

				0x00e8, asyw->scale.dw);

	return 0;

}



static int

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

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ struct nv50_wndw_func { 
	int (*xlut_clr)(struct nv50_wndw *);

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

	int (*image_clr)(struct nv50_wndw *);

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

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

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



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE