Commit 05d271c3 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/ce/ga100-: initial support 



- replaces the hacked-up version that existed solely to support TTM
- noop until the next commit, adding proper support for ampere host

v2. fixup for ga103 early merge

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

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

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ 
#define PASCAL_DMA_COPY_B                                            0x0000c1b5

#define VOLTA_DMA_COPY_A                                             0x0000c3b5

#define TURING_DMA_COPY_A                                            0x0000c5b5

#define AMPERE_DMA_COPY_A                                            0x0000c6b5

#define AMPERE_DMA_COPY_B                                            0x0000c7b5



#define FERMI_DECOMPRESS                                             0x000090b8

drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h

+2 −0
Original line number Diff line number Diff line
@@ -12,4 +12,6 @@ int gp100_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct n 
int gp102_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int gv100_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int tu102_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int ga100_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int ga102_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

#endif

drivers/gpu/drm/nouveau/nouveau_bo.c

+3 −0
Original line number Diff line number Diff line
@@ -856,6 +856,9 @@ nouveau_bo_move_init(struct nouveau_drm *drm) 
		int (*init)(struct nouveau_channel *, u32 handle);

	} _methods[] = {

		{  "COPY", 4, 0xc7b5, nve0_bo_move_copy, nve0_bo_move_init },

		{  "GRCE", 0, 0xc7b5, nve0_bo_move_copy, nvc0_bo_move_init },

		{  "COPY", 4, 0xc6b5, nve0_bo_move_copy, nve0_bo_move_init },

		{  "GRCE", 0, 0xc6b5, nve0_bo_move_copy, nvc0_bo_move_init },

		{  "COPY", 4, 0xc5b5, nve0_bo_move_copy, nve0_bo_move_init },

		{  "GRCE", 0, 0xc5b5, nve0_bo_move_copy, nvc0_bo_move_init },

		{  "COPY", 4, 0xc3b5, nve0_bo_move_copy, nve0_bo_move_init },

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

+2 −0
Original line number Diff line number Diff line
@@ -8,3 +8,5 @@ nvkm-y += nvkm/engine/ce/gp100.o 
nvkm-y += nvkm/engine/ce/gp102.o

nvkm-y += nvkm/engine/ce/gv100.o

nvkm-y += nvkm/engine/ce/tu102.o

nvkm-y += nvkm/engine/ce/ga100.o

nvkm-y += nvkm/engine/ce/ga102.o

drivers/gpu/drm/nouveau/nvkm/engine/ce/ga100.c

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

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

 */

#include "priv.h"



#include <subdev/vfn.h>



#include <nvif/class.h>



static irqreturn_t

ga100_ce_intr(struct nvkm_inth *inth)

{

	struct nvkm_subdev *subdev = container_of(inth, typeof(*subdev), inth);



	/*TODO*/

	nvkm_error(subdev, "intr\n");

	return IRQ_NONE;

}



int

ga100_ce_fini(struct nvkm_engine *engine, bool suspend)

{

	nvkm_inth_block(&engine->subdev.inth);

	return 0;

}



int

ga100_ce_init(struct nvkm_engine *engine)

{

	nvkm_inth_allow(&engine->subdev.inth);

	return 0;

}



int

ga100_ce_oneinit(struct nvkm_engine *engine)

{

	struct nvkm_subdev *subdev = &engine->subdev;

	struct nvkm_device *device = subdev->device;

	u32 vector;



	vector = nvkm_rd32(device, 0x10442c + (subdev->inst * 0x80)) & 0x00000fff;



	return nvkm_inth_add(&device->vfn->intr, vector, NVKM_INTR_PRIO_NORMAL,

			     subdev, ga100_ce_intr, &subdev->inth);

}



static const struct nvkm_engine_func

ga100_ce = {

	.oneinit = ga100_ce_oneinit,

	.init = ga100_ce_init,

	.fini = ga100_ce_fini,

	.cclass = &gv100_ce_cclass,

	.sclass = {

		{ -1, -1, AMPERE_DMA_COPY_A },

		{}

	}

};



int

ga100_ce_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,

	     struct nvkm_engine **pengine)

{

	return nvkm_engine_new_(&ga100_ce, device, type, inst, true, pengine);

}