Commit 46f74a8a authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/disp/nv50-: simplify definition of overlay channels 



Introduces a new method of defining channels available from the display,
common to all channel types, allowing for more flexibility in available
channel types/counts, and reducing the amount of boiler-plate required.

This will be required to support Volta.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent abc1d437

drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ nvkm-y += nvkm/engine/disp/coregp102.o 
nvkm-y += nvkm/engine/disp/ovlynv50.o

nvkm-y += nvkm/engine/disp/ovlyg84.o

nvkm-y += nvkm/engine/disp/ovlygt200.o

nvkm-y += nvkm/engine/disp/ovlygt215.o

nvkm-y += nvkm/engine/disp/ovlygf119.o

nvkm-y += nvkm/engine/disp/ovlygk104.o

nvkm-y += nvkm/engine/disp/ovlygp102.o

drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h

+26 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <core/object.h>

#include "nv50.h"

struct nv50_disp_root;

struct nv50_disp_dmac_func;



struct nv50_disp_chan {

	const struct nv50_disp_chan_func *func;
@@ -49,6 +50,30 @@ void nv50_disp_chan_uevent_send(struct nv50_disp *, int); 


extern const struct nvkm_event_func gf119_disp_chan_uevent;



int nv50_disp_ovly_new_(const struct nv50_disp_dmac_func *,

			const struct nv50_disp_chan_mthd *,

			struct nv50_disp *, int chid,

			const struct nvkm_oclass *, void *argv, u32 argc,

			struct nvkm_object **);



int nv50_disp_ovly_new(const struct nvkm_oclass *, void *, u32,

		       struct nv50_disp *, struct nvkm_object **);



int g84_disp_ovly_new(const struct nvkm_oclass *, void *, u32,

		      struct nv50_disp *, struct nvkm_object **);



int gt200_disp_ovly_new(const struct nvkm_oclass *, void *, u32,

			struct nv50_disp *, struct nvkm_object **);



int gf119_disp_ovly_new(const struct nvkm_oclass *, void *, u32,

			struct nv50_disp *, struct nvkm_object **);



int gk104_disp_ovly_new(const struct nvkm_oclass *, void *, u32,

			struct nv50_disp *, struct nvkm_object **);



int gp102_disp_ovly_new(const struct nvkm_oclass *, void *, u32,

			struct nv50_disp *, struct nvkm_object **);



struct nv50_disp_mthd_list {

	u32 mthd;

	u32 addr;
@@ -81,7 +106,6 @@ extern const struct nv50_disp_chan_mthd g84_disp_core_chan_mthd; 
extern const struct nv50_disp_mthd_list g84_disp_core_mthd_dac;

extern const struct nv50_disp_mthd_list g84_disp_core_mthd_head;

extern const struct nv50_disp_chan_mthd g84_disp_base_chan_mthd;

extern const struct nv50_disp_chan_mthd g84_disp_ovly_chan_mthd;



extern const struct nv50_disp_chan_mthd g94_disp_core_chan_mthd;
@@ -92,7 +116,7 @@ extern const struct nv50_disp_mthd_list gf119_disp_core_mthd_pior; 
extern const struct nv50_disp_chan_mthd gf119_disp_base_chan_mthd;



extern const struct nv50_disp_chan_mthd gk104_disp_core_chan_mthd;

extern const struct nv50_disp_chan_mthd gk104_disp_ovly_chan_mthd;

extern const struct nv50_disp_chan_mthd gk104_disp_ovly_mthd;



struct nv50_disp_pioc_oclass {

	int (*ctor)(const struct nv50_disp_chan_func *,

drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h

+0 −12
Original line number Diff line number Diff line
@@ -55,37 +55,26 @@ int nv50_disp_base_new(const struct nv50_disp_dmac_func *, 
		       struct nv50_disp_root *, int chid,

		       const struct nvkm_oclass *oclass, void *data, u32 size,

		       struct nvkm_object **);

int nv50_disp_ovly_new(const struct nv50_disp_dmac_func *,

		       const struct nv50_disp_chan_mthd *,

		       struct nv50_disp_root *, int chid,

		       const struct nvkm_oclass *oclass, void *data, u32 size,

		       struct nvkm_object **);



extern const struct nv50_disp_dmac_oclass nv50_disp_core_oclass;

extern const struct nv50_disp_dmac_oclass nv50_disp_base_oclass;

extern const struct nv50_disp_dmac_oclass nv50_disp_ovly_oclass;



extern const struct nv50_disp_dmac_oclass g84_disp_core_oclass;

extern const struct nv50_disp_dmac_oclass g84_disp_base_oclass;

extern const struct nv50_disp_dmac_oclass g84_disp_ovly_oclass;



extern const struct nv50_disp_dmac_oclass g94_disp_core_oclass;



extern const struct nv50_disp_dmac_oclass gt200_disp_core_oclass;

extern const struct nv50_disp_dmac_oclass gt200_disp_base_oclass;

extern const struct nv50_disp_dmac_oclass gt200_disp_ovly_oclass;



extern const struct nv50_disp_dmac_oclass gt215_disp_core_oclass;

extern const struct nv50_disp_dmac_oclass gt215_disp_base_oclass;

extern const struct nv50_disp_dmac_oclass gt215_disp_ovly_oclass;



extern const struct nv50_disp_dmac_oclass gf119_disp_core_oclass;

extern const struct nv50_disp_dmac_oclass gf119_disp_base_oclass;

extern const struct nv50_disp_dmac_oclass gf119_disp_ovly_oclass;



extern const struct nv50_disp_dmac_oclass gk104_disp_core_oclass;

extern const struct nv50_disp_dmac_oclass gk104_disp_base_oclass;

extern const struct nv50_disp_dmac_oclass gk104_disp_ovly_oclass;



extern const struct nv50_disp_dmac_oclass gk110_disp_core_oclass;

extern const struct nv50_disp_dmac_oclass gk110_disp_base_oclass;
@@ -98,5 +87,4 @@ extern const struct nv50_disp_dmac_oclass gp100_disp_core_oclass; 


extern const struct nv50_disp_dmac_oclass gp102_disp_core_oclass;

extern const struct nv50_disp_dmac_oclass gp102_disp_base_oclass;

extern const struct nv50_disp_dmac_oclass gp102_disp_ovly_oclass;

#endif

drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlyg84.c

+9 −15
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 
 * Authors: Ben Skeggs

 */

#include "dmacnv50.h"

#include "rootnv50.h"



#include <nvif/class.h>



static const struct nv50_disp_mthd_list

g84_disp_ovly_mthd_base = {
@@ -54,8 +51,8 @@ g84_disp_ovly_mthd_base = { 
	}

};



const struct nv50_disp_chan_mthd

g84_disp_ovly_chan_mthd = {

static const struct nv50_disp_chan_mthd

g84_disp_ovly_mthd = {

	.name = "Overlay",

	.addr = 0x000540,

	.prev = 0x000004,
@@ -65,13 +62,10 @@ g84_disp_ovly_chan_mthd = { 
	}

};



const struct nv50_disp_dmac_oclass

g84_disp_ovly_oclass = {

	.base.oclass = G82_DISP_OVERLAY_CHANNEL_DMA,

	.base.minver = 0,

	.base.maxver = 0,

	.ctor = nv50_disp_ovly_new,

	.func = &nv50_disp_dmac_func,

	.mthd = &g84_disp_ovly_chan_mthd,

	.chid = 3,

};
 
int

g84_disp_ovly_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,

		  struct nv50_disp *disp, struct nvkm_object **pobject)

{

	return nv50_disp_ovly_new_(&nv50_disp_dmac_func, &g84_disp_ovly_mthd,

				   disp, 3, oclass, argv, argc, pobject);

}

drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlygf119.c

+8 −14
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 
 * Authors: Ben Skeggs

 */

#include "dmacnv50.h"

#include "rootnv50.h"



#include <nvif/class.h>



static const struct nv50_disp_mthd_list

gf119_disp_ovly_mthd_base = {
@@ -79,7 +76,7 @@ gf119_disp_ovly_mthd_base = { 
};



static const struct nv50_disp_chan_mthd

gf119_disp_ovly_chan_mthd = {

gf119_disp_ovly_mthd = {

	.name = "Overlay",

	.addr = 0x001000,

	.prev = -0x020000,
@@ -89,13 +86,10 @@ gf119_disp_ovly_chan_mthd = { 
	}

};



const struct nv50_disp_dmac_oclass

gf119_disp_ovly_oclass = {

	.base.oclass = GF110_DISP_OVERLAY_CONTROL_DMA,

	.base.minver = 0,

	.base.maxver = 0,

	.ctor = nv50_disp_ovly_new,

	.func = &gf119_disp_dmac_func,

	.mthd = &gf119_disp_ovly_chan_mthd,

	.chid = 5,

};
 
int

gf119_disp_ovly_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,

		    struct nv50_disp *disp, struct nvkm_object **pobject)

{

	return nv50_disp_ovly_new_(&gf119_disp_dmac_func, &gf119_disp_ovly_mthd,

				   disp, 5, oclass, argv, argc, pobject);

}