Commit 93f7f054 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



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

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

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct nv50_head_func { 
			   struct nv50_head_atom *);

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

	int (*curs_clr)(struct nv50_head *);

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

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

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

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

	void (*procamp)(struct nv50_head *, struct nv50_head_atom *);
@@ -59,7 +59,7 @@ int head507d_curs_layout(struct nv50_head *, struct nv50_wndw_atom *, 
			 struct nv50_head_atom *);

int head507d_curs_format(struct nv50_head *, struct nv50_wndw_atom *,

			 struct nv50_head_atom *);

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

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

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

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

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

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

+9 −8
Original line number Diff line number Diff line
@@ -78,12 +78,13 @@ head507d_ovly(struct nv50_head *head, struct nv50_head_atom *asyh) 
	}

}



void

int

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

{

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

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

	const int i = head->base.index;

	u32 bounds = 0;

	u32 *push;

	int ret;



	if (asyh->base.cpp) {

		switch (asyh->base.cpp) {
@@ -98,11 +99,11 @@ head507d_base(struct nv50_head *head, struct nv50_head_atom *asyh) 
		bounds |= 0x00000001;

	}



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

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

		evo_data(push, bounds);

		evo_kick(push, core);

	}

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

		return ret;



	PUSH_NVSQ(push, NV507D, 0x0900 + (i * 0x400), bounds);

	return 0;

}



static int

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

+9 −8
Original line number Diff line number Diff line
@@ -103,12 +103,13 @@ head907d_ovly(struct nv50_head *head, struct nv50_head_atom *asyh) 
	}

}



static void

static int

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

{

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

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

	const int i = head->base.index;

	u32 bounds = 0;

	u32 *push;

	int ret;



	if (asyh->base.cpp) {

		switch (asyh->base.cpp) {
@@ -123,11 +124,11 @@ head907d_base(struct nv50_head *head, struct nv50_head_atom *asyh) 
		bounds |= 0x00000001;

	}



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

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

		evo_data(push, bounds);

		evo_kick(push, core);

	}

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

		return ret;



	PUSH_NVSQ(push, NV907D, 0x04d0 + (i * 0x300), bounds);

	return 0;

}



int

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

+11 −8
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include "head.h"

#include "core.h"



#include <nvif/push507c.h>



static void

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

{
@@ -36,12 +38,13 @@ head917d_dither(struct nv50_head *head, struct nv50_head_atom *asyh) 
	}

}



static void

static int

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

{

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

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

	const int i = head->base.index;

	u32 bounds = 0;

	u32 *push;

	int ret;



	if (asyh->base.cpp) {

		switch (asyh->base.cpp) {
@@ -56,11 +59,11 @@ head917d_base(struct nv50_head *head, struct nv50_head_atom *asyh) 
		bounds |= 0x00020001;

	}



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

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

		evo_data(push, bounds);

		evo_kick(push, core);

	}

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

		return ret;



	PUSH_NVSQ(push, NV917D, 0x04d0 + (i * 0x300), bounds);

	return 0;

}



int

CRA Git | Maintained and supported by SUSTech CRA and CCSE