Commit af3a4f7e authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/fifo: add GP10B support 



GP10B's FIFO is similar to GP100's, but only allows 512 channels.

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a558be62

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

+1 −0
Original line number Diff line number Diff line
@@ -68,4 +68,5 @@ int gm107_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **); 
int gm200_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gm20b_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gp100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gp10b_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ nvkm-y += nvkm/engine/fifo/gm107.o 
nvkm-y += nvkm/engine/fifo/gm200.o

nvkm-y += nvkm/engine/fifo/gm20b.o

nvkm-y += nvkm/engine/fifo/gp100.o

nvkm-y += nvkm/engine/fifo/gp10b.o



nvkm-y += nvkm/engine/fifo/chan.o

nvkm-y += nvkm/engine/fifo/channv50.o

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h

+1 −0
Original line number Diff line number Diff line
@@ -83,4 +83,5 @@ extern const struct nvkm_enum gk104_fifo_fault_hubclient[]; 
extern const struct nvkm_enum gk104_fifo_fault_gpcclient[];



extern const struct nvkm_enum gm107_fifo_fault_engine[];

extern const struct nvkm_enum gp100_fifo_fault_engine[];

#endif

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp100.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "gk104.h"

#include "changk104.h"



static const struct nvkm_enum

const struct nvkm_enum

gp100_fifo_fault_engine[] = {

	{ 0x01, "DISPLAY" },

	{ 0x03, "IFB", NULL, NVKM_ENGINE_IFB },

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp10b.c

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

 * Copyright (c) 2017, 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 "gk104.h"

#include "changk104.h"



static const struct gk104_fifo_func

gp10b_fifo = {

	.fault.engine = gp100_fifo_fault_engine,

	.fault.reason = gk104_fifo_fault_reason,

	.fault.hubclient = gk104_fifo_fault_hubclient,

	.fault.gpcclient = gk104_fifo_fault_gpcclient,

	.chan = {

		&gp100_fifo_gpfifo_oclass,

		NULL

	},

};



int

gp10b_fifo_new(struct nvkm_device *device, int index, struct nvkm_fifo **pfifo)

{

	return gk104_fifo_new_(&gp10b_fifo, device, index, 512, pfifo);

}