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

drm/nouveau/sec2/gp108: split from gp102 implementation 



ACR LS FW loading is moving out of SECBOOT and into their specific subdevs,
and the available GP108/GV100 FWs differ from the other GP10x boards.

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

drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h

+1 −0
Original line number Diff line number Diff line
@@ -13,5 +13,6 @@ struct nvkm_sec2 { 
};



int gp102_sec2_new(struct nvkm_device *, int, struct nvkm_sec2 **);

int gp108_sec2_new(struct nvkm_device *, int, struct nvkm_sec2 **);

int tu102_sec2_new(struct nvkm_device *, int, struct nvkm_sec2 **);

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -2376,7 +2376,7 @@ nv138_chipset = { 
	.fifo = gp100_fifo_new,

	.gr = gp108_gr_new,

	.nvdec[0] = gp102_nvdec_new,

	.sec2 = gp102_sec2_new,

	.sec2 = gp108_sec2_new,

	.sw = gf100_sw_new,

};
@@ -2444,7 +2444,7 @@ nv140_chipset = { 
	.fifo = gv100_fifo_new,

	.gr = gv100_gr_new,

	.nvdec[0] = gp102_nvdec_new,

	.sec2 = gp102_sec2_new,

	.sec2 = gp108_sec2_new,

};



static const struct nvkm_device_chip

drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild

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

nvkm-y += nvkm/engine/sec2/base.o

nvkm-y += nvkm/engine/sec2/gp102.o

nvkm-y += nvkm/engine/sec2/gp108.o

nvkm-y += nvkm/engine/sec2/tu102.o

drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c

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

 * Copyright 2019 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"



int

gp108_sec2_new(struct nvkm_device *device, int index, struct nvkm_sec2 **psec2)

{

	return nvkm_sec2_new_(device, index, 0, psec2);

}