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

drm/nouveau/top/ga100: initial support 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 18618fc6

drivers/gpu/drm/nouveau/include/nvkm/core/layout.h

+4 −2
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ NVKM_LAYOUT_ONCE(NVKM_SUBDEV_THERM , struct nvkm_therm , therm) 
NVKM_LAYOUT_ONCE(NVKM_SUBDEV_CLK     , struct nvkm_clk     ,      clk)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_GSP     , struct nvkm_gsp     ,      gsp)

NVKM_LAYOUT_INST(NVKM_SUBDEV_IOCTRL  , struct nvkm_subdev  ,   ioctrl, 3)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_FLA     , struct nvkm_subdev  ,      fla)



NVKM_LAYOUT_ONCE(NVKM_ENGINE_BSP     , struct nvkm_engine  ,      bsp)

NVKM_LAYOUT_INST(NVKM_ENGINE_CE      , struct nvkm_engine  ,       ce, 9)

NVKM_LAYOUT_INST(NVKM_ENGINE_CE      , struct nvkm_engine  ,       ce, 10)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_CIPHER  , struct nvkm_engine  ,   cipher)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_DISP    , struct nvkm_disp    ,     disp)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_DMAOBJ  , struct nvkm_dma     ,      dma)
@@ -40,9 +41,10 @@ NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSENC , struct nvkm_engine , msenc) 
NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSPDEC  , struct nvkm_engine  ,   mspdec)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSPPP   , struct nvkm_engine  ,    msppp)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSVLD   , struct nvkm_engine  ,    msvld)

NVKM_LAYOUT_INST(NVKM_ENGINE_NVDEC   , struct nvkm_nvdec   ,    nvdec, 3)

NVKM_LAYOUT_INST(NVKM_ENGINE_NVDEC   , struct nvkm_nvdec   ,    nvdec, 5)

NVKM_LAYOUT_INST(NVKM_ENGINE_NVENC   , struct nvkm_nvenc   ,    nvenc, 3)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_NVJPG   , struct nvkm_engine  ,    nvjpg)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_OFA     , struct nvkm_engine  ,      ofa)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_PM      , struct nvkm_pm      ,       pm)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_SEC     , struct nvkm_engine  ,      sec)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_SEC2    , struct nvkm_sec2    ,     sec2)

drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h

+1 −0
Original line number Diff line number Diff line
@@ -28,4 +28,5 @@ int nvkm_top_fault_id(struct nvkm_device *, enum nvkm_subdev_type, int); 
struct nvkm_subdev *nvkm_top_fault(struct nvkm_device *, int fault);



int gk104_top_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_top **);

int ga100_top_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_top **);

#endif

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+3 −0
Original line number Diff line number Diff line
@@ -2581,6 +2581,7 @@ nv170_chipset = { 
	.pci      = { 0x00000001, gp100_pci_new },

	.privring = { 0x00000001, gm200_privring_new },

	.timer    = { 0x00000001, gk20a_timer_new },

	.top      = { 0x00000001, ga100_top_new },

};



static const struct nvkm_device_chip
@@ -2598,6 +2599,7 @@ nv172_chipset = { 
	.pci      = { 0x00000001, gp100_pci_new },

	.privring = { 0x00000001, gm200_privring_new },

	.timer    = { 0x00000001, gk20a_timer_new },

	.top      = { 0x00000001, ga100_top_new },

	.disp     = { 0x00000001, ga102_disp_new },

	.dma      = { 0x00000001, gv100_dma_new },

};
@@ -2617,6 +2619,7 @@ nv174_chipset = { 
	.pci      = { 0x00000001, gp100_pci_new },

	.privring = { 0x00000001, gm200_privring_new },

	.timer    = { 0x00000001, gk20a_timer_new },

	.top      = { 0x00000001, ga100_top_new },

	.disp     = { 0x00000001, ga102_disp_new },

	.dma      = { 0x00000001, gv100_dma_new },

};

drivers/gpu/drm/nouveau/nvkm/subdev/top/Kbuild

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: MIT

nvkm-y += nvkm/subdev/top/base.o

nvkm-y += nvkm/subdev/top/gk104.o

nvkm-y += nvkm/subdev/top/ga100.o

drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c

0 → 100644
+107 −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"



static int

ga100_top_oneinit(struct nvkm_top *top)

{

	struct nvkm_subdev *subdev = &top->subdev;

	struct nvkm_device *device = subdev->device;

	struct nvkm_top_device *info = NULL;

	u32 data, type, inst;

	int i, n, size = nvkm_rd32(device, 0x0224fc) >> 20;



	for (i = 0, n = 0; i < size; i++) {

		if (!info) {

			if (!(info = nvkm_top_device_new(top)))

				return -ENOMEM;

			type = ~0;

			inst = 0;

		}



		data = nvkm_rd32(device, 0x022800 + (i * 0x04));

		nvkm_trace(subdev, "%02x: %08x\n", i, data);

		if (!data && n == 0)

			continue;



		switch (n++) {

		case 0:

			type	      = (data & 0x3f000000) >> 24;

			inst	      = (data & 0x000f0000) >> 16;

			info->fault   = (data & 0x0000007f);

			break;

		case 1:

			info->addr    = (data & 0x00fff000);

			info->reset   = (data & 0x0000001f);

			break;

		case 2:

			info->runlist = (data & 0x0000fc00) >> 10;

			info->engine  = (data & 0x00000003);

			break;

		default:

			break;

		}



		if (data & 0x80000000)

			continue;

		n = 0;



		/* Translate engine type to NVKM engine identifier. */

#define I_(T,I) do { info->type = (T); info->inst = (I); } while(0)

#define O_(T,I) do { WARN_ON(inst); I_(T, I); } while (0)

		switch (type) {

		case 0x00000000: O_(NVKM_ENGINE_GR    ,    0); break;

		case 0x0000000d: O_(NVKM_ENGINE_SEC2  ,    0); break;

		case 0x0000000e: I_(NVKM_ENGINE_NVENC , inst); break;

		case 0x00000010: I_(NVKM_ENGINE_NVDEC , inst); break;

		case 0x00000012: I_(NVKM_SUBDEV_IOCTRL, inst); break;

		case 0x00000013: I_(NVKM_ENGINE_CE    , inst); break;

		case 0x00000014: O_(NVKM_SUBDEV_GSP   ,    0); break;

		case 0x00000015: O_(NVKM_ENGINE_NVJPG ,    0); break;

		case 0x00000016: O_(NVKM_ENGINE_OFA   ,    0); break;

		case 0x00000017: O_(NVKM_SUBDEV_FLA   ,    0); break;

			break;

		default:

			break;

		}



		nvkm_debug(subdev, "%02x.%d (%8s): addr %06x fault %2d "

				   "runlist %2d engine %2d reset %2d\n", type, inst,

			   info->type == NVKM_SUBDEV_NR ? "????????" : nvkm_subdev_type[info->type],

			   info->addr, info->fault, info->runlist, info->engine, info->reset);

		info = NULL;

	}



	return 0;

}



static const struct nvkm_top_func

ga100_top = {

	.oneinit = ga100_top_oneinit,

};



int

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

	      struct nvkm_top **ptop)

{

	return nvkm_top_new_(&ga100_top, device, type, inst, ptop);

}