Commit c2c3a003 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



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

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

+0 −3
Original line number Diff line number Diff line
@@ -111,8 +111,5 @@ nvkm-y += nvkm/engine/disp/cursgk104.o 
nvkm-y += nvkm/engine/disp/cursgp102.o



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

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

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

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

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

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

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

+10 −11
Original line number Diff line number Diff line
@@ -50,12 +50,18 @@ void nv50_disp_chan_uevent_send(struct nv50_disp *, int); 


extern const struct nvkm_event_func gf119_disp_chan_uevent;



int nv50_disp_oimm_new_(const struct nv50_disp_chan_func *,

			struct nv50_disp *, int ctrl, int user,

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

			struct nvkm_object **);

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_oimm_new(const struct nvkm_oclass *, void *, u32,

		       struct nv50_disp *, struct nvkm_object **);

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

		       struct nv50_disp *, struct nvkm_object **);
@@ -65,12 +71,16 @@ int g84_disp_ovly_new(const struct nvkm_oclass *, void *, u32, 
int gt200_disp_ovly_new(const struct nvkm_oclass *, void *, u32,

			struct nv50_disp *, struct nvkm_object **);



int gf119_disp_oimm_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_oimm_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 **);
@@ -133,22 +143,16 @@ struct nv50_disp_pioc_oclass { 
	} chid;

};



extern const struct nv50_disp_pioc_oclass nv50_disp_oimm_oclass;

extern const struct nv50_disp_pioc_oclass nv50_disp_curs_oclass;



extern const struct nv50_disp_pioc_oclass g84_disp_oimm_oclass;

extern const struct nv50_disp_pioc_oclass g84_disp_curs_oclass;



extern const struct nv50_disp_pioc_oclass gt215_disp_oimm_oclass;

extern const struct nv50_disp_pioc_oclass gt215_disp_curs_oclass;



extern const struct nv50_disp_pioc_oclass gf119_disp_oimm_oclass;

extern const struct nv50_disp_pioc_oclass gf119_disp_curs_oclass;



extern const struct nv50_disp_pioc_oclass gk104_disp_oimm_oclass;

extern const struct nv50_disp_pioc_oclass gk104_disp_curs_oclass;



extern const struct nv50_disp_pioc_oclass gp102_disp_oimm_oclass;

extern const struct nv50_disp_pioc_oclass gp102_disp_curs_oclass;



int nv50_disp_curs_new(const struct nv50_disp_chan_func *,
@@ -156,9 +160,4 @@ int nv50_disp_curs_new(const struct nv50_disp_chan_func *, 
		       struct nv50_disp_root *, int ctrl, int user,

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

		       struct nvkm_object **);

int nv50_disp_oimm_new(const struct nv50_disp_chan_func *,

		       const struct nv50_disp_chan_mthd *,

		       struct nv50_disp_root *, int ctrl, int user,

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

		       struct nvkm_object **);

#endif

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

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Ben Skeggs

 */

#include "channv50.h"

#include "rootnv50.h"



#include <nvif/class.h>



const struct nv50_disp_pioc_oclass

g84_disp_oimm_oclass = {

	.base.oclass = G82_DISP_OVERLAY,

	.base.minver = 0,

	.base.maxver = 0,

	.ctor = nv50_disp_oimm_new,

	.func = &nv50_disp_pioc_func,

	.chid = { 5, 5 },

};

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

+7 −12
Original line number Diff line number Diff line
@@ -22,16 +22,11 @@ 
 * Authors: Ben Skeggs

 */

#include "channv50.h"

#include "rootnv50.h"



#include <nvif/class.h>



const struct nv50_disp_pioc_oclass

gf119_disp_oimm_oclass = {

	.base.oclass = GF110_DISP_OVERLAY,

	.base.minver = 0,

	.base.maxver = 0,

	.ctor = nv50_disp_oimm_new,

	.func = &gf119_disp_pioc_func,

	.chid = { 9, 9 },

};
 
int

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

		    struct nv50_disp *disp, struct nvkm_object **pobject)

{

	return nv50_disp_oimm_new_(&gf119_disp_pioc_func, disp, 9, 9,

				   oclass, argv, argc, pobject);

}

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

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Ben Skeggs

 */

#include "channv50.h"

#include "rootnv50.h"



#include <nvif/class.h>



const struct nv50_disp_pioc_oclass

gk104_disp_oimm_oclass = {

	.base.oclass = GK104_DISP_OVERLAY,

	.base.minver = 0,

	.base.maxver = 0,

	.ctor = nv50_disp_oimm_new,

	.func = &gf119_disp_pioc_func,

	.chid = { 9, 9 },

};