Commit 9c1c08a6 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/disp/gv100-: expose capabilities class 



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

drivers/gpu/drm/nouveau/include/nvif/class.h

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ 
#define GV100_DISP                                    /* cl5070.h */ 0x0000c370

#define TU102_DISP                                    /* cl5070.h */ 0x0000c570



#define GV100_DISP_CAPS                                              0x0000c373



#define NV31_MPEG                                                    0x00003174

#define G82_MPEG                                                     0x00008274

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

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ nvkm-y += nvkm/engine/disp/rootgp102.o 
nvkm-y += nvkm/engine/disp/rootgv100.o

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



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



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

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

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

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

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2020 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.

 */

#define gv100_disp_caps(p) container_of((p), struct gv100_disp_caps, object)

#include "rootnv50.h"



struct gv100_disp_caps {

	struct nvkm_object object;

	struct nv50_disp *disp;

};



static int

gv100_disp_caps_map(struct nvkm_object *object, void *argv, u32 argc,

		    enum nvkm_object_map *type, u64 *addr, u64 *size)

{

	struct gv100_disp_caps *caps = gv100_disp_caps(object);

	struct nvkm_device *device = caps->disp->base.engine.subdev.device;

	*type = NVKM_OBJECT_MAP_IO;

	*addr = 0x640000 + device->func->resource_addr(device, 0);

	*size = 0x1000;

	return 0;

}



static const struct nvkm_object_func

gv100_disp_caps = {

	.map = gv100_disp_caps_map,

};



int

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

		    struct nv50_disp *disp, struct nvkm_object **pobject)

{

	struct gv100_disp_caps *caps;



	if (!(caps = kzalloc(sizeof(*caps), GFP_KERNEL)))

		return -ENOMEM;

	*pobject = &caps->object;



	nvkm_object_ctor(&gv100_disp_caps, oclass, &caps->object);

	caps->disp = disp;

	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
static const struct nv50_disp_root_func

gv100_disp_root = {

	.user = {

		{{-1,-1,GV100_DISP_CAPS                }, gv100_disp_caps_new },

		{{0,0,GV100_DISP_CURSOR                }, gv100_disp_curs_new },

		{{0,0,GV100_DISP_WINDOW_IMM_CHANNEL_DMA}, gv100_disp_wimm_new },

		{{0,0,GV100_DISP_CORE_CHANNEL_DMA      }, gv100_disp_core_new },

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

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ int nv50_disp_root_new_(const struct nv50_disp_root_func *, struct nvkm_disp *, 
			 const struct nvkm_oclass *, void *data, u32 size,

			 struct nvkm_object **);



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

			struct nv50_disp *, struct nvkm_object **);



extern const struct nvkm_disp_oclass nv50_disp_root_oclass;

extern const struct nvkm_disp_oclass g84_disp_root_oclass;

extern const struct nvkm_disp_oclass g94_disp_root_oclass;