Commit 6d41a753 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



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

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

+0 −3
Original line number Diff line number Diff line
@@ -100,10 +100,7 @@ nvkm-y += nvkm/engine/disp/piocnv50.o 
nvkm-y += nvkm/engine/disp/piocgf119.o



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

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

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

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

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

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



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

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

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


extern const struct nvkm_event_func gf119_disp_chan_uevent;



int nv50_disp_curs_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_oimm_new_(const struct nv50_disp_chan_func *,

			struct nv50_disp *, int ctrl, int user,

			const struct nvkm_oclass *, void *argv, u32 argc,
@@ -65,6 +69,8 @@ int nv50_disp_ovly_new_(const struct nv50_disp_dmac_func *, 
			const struct nvkm_oclass *, void *argv, u32 argc,

			struct nvkm_object **);



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

		       struct nv50_disp *, struct nvkm_object **);

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

		       struct nv50_disp *, struct nvkm_object **);

int nv50_disp_base_new(const struct nvkm_oclass *, void *, u32,
@@ -80,6 +86,8 @@ 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_curs_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_base_new(const struct nvkm_oclass *, void *, u32,
@@ -90,6 +98,8 @@ int gf119_disp_ovly_new(const struct nvkm_oclass *, void *, u32, 
int gk104_disp_ovly_new(const struct nvkm_oclass *, void *, u32,

			struct nv50_disp *, struct nvkm_object **);



int gp102_disp_curs_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_base_new(const struct nvkm_oclass *, void *, u32,
@@ -139,37 +149,4 @@ extern const struct nv50_disp_chan_mthd gf119_disp_base_mthd; 


extern const struct nv50_disp_chan_mthd gk104_disp_core_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 *,

		    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 **);

	struct nvkm_sclass base;

	const struct nv50_disp_chan_func *func;

	const struct nv50_disp_chan_mthd *mthd;

	struct {

		int ctrl;

		int user;

	} chid;

};



extern const struct nv50_disp_pioc_oclass nv50_disp_curs_oclass;



extern const struct nv50_disp_pioc_oclass g84_disp_curs_oclass;



extern const struct nv50_disp_pioc_oclass gt215_disp_curs_oclass;



extern const struct nv50_disp_pioc_oclass gf119_disp_curs_oclass;



extern const struct nv50_disp_pioc_oclass gk104_disp_curs_oclass;



extern const struct nv50_disp_pioc_oclass gp102_disp_curs_oclass;



int nv50_disp_curs_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/cursg84.c

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

 * Copyright 2015 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 <bskeggs@redhat.com>

 */

#include "channv50.h"

#include "rootnv50.h"



#include <nvif/class.h>



const struct nv50_disp_pioc_oclass

g84_disp_curs_oclass = {

	.base.oclass = G82_DISP_CURSOR,

	.base.minver = 0,

	.base.maxver = 0,

	.ctor = nv50_disp_curs_new,

	.func = &nv50_disp_pioc_func,

	.chid = { 7, 7 },

};

drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgf119.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_curs_oclass = {

	.base.oclass = GF110_DISP_CURSOR,

	.base.minver = 0,

	.base.maxver = 0,

	.ctor = nv50_disp_curs_new,

	.func = &gf119_disp_pioc_func,

	.chid = { 13, 13 },

};
 
int

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

		    struct nv50_disp *disp, struct nvkm_object **pobject)

{

	return nv50_disp_curs_new_(&gf119_disp_pioc_func, disp, 13, 13,

				   oclass, argv, argc, pobject);

}

drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgk104.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_curs_oclass = {

	.base.oclass = GK104_DISP_CURSOR,

	.base.minver = 0,

	.base.maxver = 0,

	.ctor = nv50_disp_curs_new,

	.func = &gf119_disp_pioc_func,

	.chid = { 13, 13 },

};