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

drm/nouveau/pmu/gp10b: split from gm20b implementation 



ACR LS FW loading is moving out of SECBOOT and into their specific subdevs,
and the available GM20B/GP10B FWs have interface differences.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ int gm107_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **); 
int gm20b_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 **);

int gp10b_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

+1 −1
Original line number Diff line number Diff line
@@ -2395,7 +2395,7 @@ nv13b_chipset = { 
	.mc = gp10b_mc_new,

	.mmu = gp10b_mmu_new,

	.secboot = gp10b_secboot_new,

	.pmu = gm20b_pmu_new,

	.pmu = gp10b_pmu_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.ce[0] = gp100_ce_new,

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

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ nvkm-y += nvkm/subdev/pmu/gm107.o 
nvkm-y += nvkm/subdev/pmu/gm20b.o

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

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

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

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

+4 −11
Original line number Diff line number Diff line
@@ -19,12 +19,11 @@ 
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 */



#include <engine/falcon.h>

#include <core/msgqueue.h>

#include "priv.h"

#include <core/msgqueue.h>

#include <engine/falcon.h>



static void

void

gm20b_pmu_recv(struct nvkm_pmu *pmu)

{

	if (!pmu->queue) {
@@ -46,11 +45,5 @@ gm20b_pmu = { 
int

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

{

	int ret;



	ret = nvkm_pmu_new_(&gm20b_pmu, device, index, ppmu);

	if (ret)

		return ret;



	return 0;

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

}

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

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

 * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.

 *

 * 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 AUTHORS OR COPYRIGHT HOLDERS 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 const struct nvkm_pmu_func

gp10b_pmu = {

	.enabled = gf100_pmu_enabled,

	.intr = gt215_pmu_intr,

	.recv = gm20b_pmu_recv,

};



int

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

{

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

}