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

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

drm/nouveau/pmu/gp102: initial implementation 



GP102/GP104 require a harder reset of PMU prior to DEVINIT, or the IFR
image will hang.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ int gk208_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **); 
int gk20a_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);

int gm107_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);

int gp100_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);

int gp102_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);



/* interface to MEMX process running on PMU */

struct nvkm_memx;

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

+2 −0
Original line number Diff line number Diff line
@@ -2200,6 +2200,7 @@ nv132_chipset = { 
	.mc = gp100_mc_new,

	.mmu = gf100_mmu_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.ce[0] = gp104_ce_new,
@@ -2228,6 +2229,7 @@ nv134_chipset = { 
	.mc = gp100_mc_new,

	.mmu = gf100_mmu_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.ce[0] = gp104_ce_new,

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

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ nvkm-y += nvkm/subdev/pmu/gk208.o 
nvkm-y += nvkm/subdev/pmu/gk20a.o

nvkm-y += nvkm/subdev/pmu/gm107.o

nvkm-y += nvkm/subdev/pmu/gp100.o

nvkm-y += nvkm/subdev/pmu/gp102.o

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c

0 → 100644
+43 −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 void

gp102_pmu_reset(struct nvkm_pmu *pmu)

{

	struct nvkm_device *device = pmu->subdev.device;

	nvkm_mask(device, 0x10a3c0, 0x00000001, 0x00000001);

	nvkm_mask(device, 0x10a3c0, 0x00000001, 0x00000000);

}



static const struct nvkm_pmu_func

gp102_pmu = {

	.reset = gp102_pmu_reset,

};



int

gp102_pmu_new(struct nvkm_device *device, int index, struct nvkm_pmu **ppmu)

{

	return nvkm_pmu_new_(&gp102_pmu, device, index, ppmu);

}