Commit 96616b4c authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv108/gr: initial support (need external fuc) 



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

drivers/gpu/drm/nouveau/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ nouveau-y += core/engine/graph/ctxnvd7.o 
nouveau-y += core/engine/graph/ctxnvd9.o

nouveau-y += core/engine/graph/ctxnve4.o

nouveau-y += core/engine/graph/ctxnvf0.o

nouveau-y += core/engine/graph/ctxnv108.o

nouveau-y += core/engine/graph/nv04.o

nouveau-y += core/engine/graph/nv10.o

nouveau-y += core/engine/graph/nv20.o
@@ -261,6 +262,7 @@ nouveau-y += core/engine/graph/nvd7.o 
nouveau-y += core/engine/graph/nvd9.o

nouveau-y += core/engine/graph/nve4.o

nouveau-y += core/engine/graph/nvf0.o

nouveau-y += core/engine/graph/nv108.o

nouveau-y += core/engine/mpeg/nv31.o

nouveau-y += core/engine/mpeg/nv40.o

nouveau-y += core/engine/mpeg/nv44.o

drivers/gpu/drm/nouveau/core/engine/device/nve0.c

+1 −3
Original line number Diff line number Diff line
@@ -213,10 +213,8 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv108_fifo_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  nvf0_graph_oclass;

#endif

		device->oclass[NVDEV_ENGINE_GR     ] =  nv108_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nvf0_disp_oclass;

		device->oclass[NVDEV_ENGINE_COPY0  ] = &nve0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nve0_copy1_oclass;

drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c

0 → 100644
+1408 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvf0.c

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ nvf0_grctx_init_unk40xx[] = { 
	{}

};



static struct nvc0_graph_init

struct nvc0_graph_init

nvf0_grctx_init_unk44xx[] = {

	{ 0x404404,  12, 0x04, 0x00000000 },

	{ 0x404438,   1, 0x04, 0x00000000 },
@@ -62,7 +62,7 @@ nvf0_grctx_init_unk44xx[] = { 
	{}

};



static struct nvc0_graph_init

struct nvc0_graph_init

nvf0_grctx_init_unk5bxx[] = {

	{ 0x405b00,   1, 0x04, 0x00000000 },

	{ 0x405b10,   1, 0x04, 0x00001000 },
@@ -70,7 +70,7 @@ nvf0_grctx_init_unk5bxx[] = { 
	{}

};



static struct nvc0_graph_init

struct nvc0_graph_init

nvf0_grctx_init_unk60xx[] = {

	{ 0x406020,   1, 0x04, 0x034103c1 },

	{ 0x406028,   4, 0x04, 0x00000001 },

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnv108.fuc5

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

 * Copyright 2013 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>

 */



#define NV_PGRAPH_GPCX_UNK__SIZE                                     0x00000001



#define CHIPSET GK208

#include "macros.fuc"



.section #nv108_grgpc_data

#define INCLUDE_DATA

#include "com.fuc"

#include "gpc.fuc"

#undef INCLUDE_DATA



.section #nv108_grgpc_code

#define INCLUDE_CODE

bra #init

#include "com.fuc"

#include "gpc.fuc"

.align 256

#undef INCLUDE_CODE