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

Commit 667e99ab authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



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

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

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ void nvkm_mc_reset(struct nvkm_mc *, enum nvkm_devidx); 
void nvkm_mc_unk260(struct nvkm_mc *, u32 data);



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

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

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

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ nv11_chipset = { 
	.gpio = nv10_gpio_new,

	.i2c = nv04_i2c_new,

	.imem = nv04_instmem_new,

	.mc = nv04_mc_new,

	.mc = nv11_mc_new,

	.mmu = nv04_mmu_new,

	.pci = nv04_pci_new,

	.timer = nv04_timer_new,

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

+1 −0
Original line number Diff line number Diff line 
nvkm-y += nvkm/subdev/mc/base.o

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

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

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

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

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

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

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,13 @@ 
 */

#include "priv.h"



const struct nvkm_mc_map

nv04_mc_reset[] = {

	{ 0x00001000, NVKM_ENGINE_GR },

	{ 0x00000100, NVKM_ENGINE_FIFO },

	{}

};



const struct nvkm_mc_map

nv04_mc_intr[] = {

	{ 0x00000001, NVKM_ENGINE_MPEG },	/* NV17- MPEG/ME */

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

0 → 100644
+50 −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 <bskeggs@redhat.com>

 */

#include "priv.h"



static const struct nvkm_mc_map

nv11_mc_intr[] = {

	{ 0x03010000, NVKM_ENGINE_DISP },

	{ 0x00001000, NVKM_ENGINE_GR },

	{ 0x00000100, NVKM_ENGINE_FIFO },

	{ 0x10000000, NVKM_SUBDEV_BUS },

	{ 0x00100000, NVKM_SUBDEV_TIMER },

	{}

};



static const struct nvkm_mc_func

nv11_mc = {

	.init = nv04_mc_init,

	.intr = nv11_mc_intr,

	.intr_unarm = nv04_mc_intr_unarm,

	.intr_rearm = nv04_mc_intr_rearm,

	.intr_mask = nv04_mc_intr_mask,

	.reset = nv04_mc_reset,

};



int

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

{

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

}