Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33537d6f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mc/gk104: define reset masks + intr cleanup 



Engine fields have been removed, as they're specified by PTOP.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -18,5 +18,6 @@ int nv44_mc_new(struct nvkm_device *, int, struct nvkm_mc **); 
int nv50_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int g98_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gf100_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gk104_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gk20a_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

#endif

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

+5 −5
Original line number Diff line number Diff line
@@ -1676,7 +1676,7 @@ nve4_chipset = { 
	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gf100_mc_new,

	.mc = gk104_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,
@@ -1715,7 +1715,7 @@ nve6_chipset = { 
	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gf100_mc_new,

	.mc = gk104_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,
@@ -1754,7 +1754,7 @@ nve7_chipset = { 
	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gf100_mc_new,

	.mc = gk104_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,
@@ -1818,7 +1818,7 @@ nvf0_chipset = { 
	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gf100_mc_new,

	.mc = gk104_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,
@@ -1856,7 +1856,7 @@ nvf1_chipset = { 
	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gf100_mc_new,

	.mc = gk104_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

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

+1 −0
Original line number Diff line number Diff line
@@ -4,4 +4,5 @@ nvkm-y += nvkm/subdev/mc/nv44.o 
nvkm-y += nvkm/subdev/mc/nv50.o

nvkm-y += nvkm/subdev/mc/g98.o

nvkm-y += nvkm/subdev/mc/gf100.o

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

nvkm-y += nvkm/subdev/mc/gk20a.o

drivers/gpu/drm/nouveau/nvkm/subdev/mc/gk104.c

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

 * Copyright 2016 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 "priv.h"



const struct nvkm_mc_map

gk104_mc_reset[] = {

	{ 0x00000100, NVKM_ENGINE_FIFO },

	{}

};



const struct nvkm_mc_map

gk104_mc_intr[] = {

	{ 0x04000000, NVKM_ENGINE_DISP },

	{ 0x00000100, NVKM_ENGINE_FIFO },

	{ 0x40000000, NVKM_SUBDEV_IBUS },

	{ 0x10000000, NVKM_SUBDEV_BUS },

	{ 0x08000000, NVKM_SUBDEV_FB },

	{ 0x02000000, NVKM_SUBDEV_LTC },

	{ 0x01000000, NVKM_SUBDEV_PMU },

	{ 0x00200000, NVKM_SUBDEV_GPIO },

	{ 0x00200000, NVKM_SUBDEV_I2C },

	{ 0x00100000, NVKM_SUBDEV_TIMER },

	{ 0x00040000, NVKM_SUBDEV_THERM },

	{ 0x00002000, NVKM_SUBDEV_FB },

	{},

};



static const struct nvkm_mc_func

gk104_mc = {

	.init = nv50_mc_init,

	.intr = gk104_mc_intr,

	.intr_unarm = gf100_mc_intr_unarm,

	.intr_rearm = gf100_mc_intr_rearm,

	.intr_mask = gf100_mc_intr_mask,

	.reset = gk104_mc_reset,

	.unk260 = gf100_mc_unk260,

};



int

gk104_mc_new(struct nvkm_device *device, int index, struct nvkm_mc **pmc)

{

	return nvkm_mc_new_(&gk104_mc, device, index, pmc);

}

drivers/gpu/drm/nouveau/nvkm/subdev/mc/gk20a.c

+2 −1
Original line number Diff line number Diff line
@@ -26,10 +26,11 @@ 
static const struct nvkm_mc_func

gk20a_mc = {

	.init = nv50_mc_init,

	.intr = gf100_mc_intr,

	.intr = gk104_mc_intr,

	.intr_unarm = gf100_mc_intr_unarm,

	.intr_rearm = gf100_mc_intr_rearm,

	.intr_mask = gf100_mc_intr_mask,

	.reset = gk104_mc_reset,

};



int