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

drm/nouveau/fifo: add GM20B fifo 



GM20B has a 512-channels FIFO similar to GK104.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ extern struct nvkm_oclass *gk104_fifo_oclass; 
extern struct nvkm_oclass *gk20a_fifo_oclass;

extern struct nvkm_oclass *gk208_fifo_oclass;

extern struct nvkm_oclass *gm204_fifo_oclass;

extern struct nvkm_oclass *gm20b_fifo_oclass;



int  nvkm_fifo_uevent_ctor(struct nvkm_object *, void *, u32,

			   struct nvkm_notify *);

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

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ nvkm-y += nvkm/engine/fifo/gk104.o 
nvkm-y += nvkm/engine/fifo/gk20a.o

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

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

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

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

+4 −0
Original line number Diff line number Diff line
@@ -15,4 +15,8 @@ struct gk104_fifo_impl { 
};



extern struct nvkm_ofuncs gk104_fifo_chan_ofuncs;



int  gm204_fifo_ctor(struct nvkm_object *, struct nvkm_object *,

		    struct nvkm_oclass *, void *, u32,

		    struct nvkm_object **);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ gm204_fifo_sclass[] = { 
	{}

};



static int

int

gm204_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,

		struct nvkm_oclass *oclass, void *data, u32 size,

		struct nvkm_object **pobject)

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

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

 * Copyright (c) 2015, 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"



struct nvkm_oclass *

gm20b_fifo_oclass = &(struct gk104_fifo_impl) {

	.base.handle = NV_ENGINE(FIFO, 0x2b),

	.base.ofuncs = &(struct nvkm_ofuncs) {

		.ctor = gm204_fifo_ctor,

		.dtor = gk104_fifo_dtor,

		.init = gk104_fifo_init,

		.fini = gk104_fifo_fini,

	},

	.channels = 512,

}.base;