Commit 23c14ed2 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Ben Skeggs
Browse files

nvc0/bsp: initial implementation of engine 



Will allow use of the engine if firmware (nvXX_fuc084) provided.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 66433c2a

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ nouveau-y += core/engine/dmaobj/nv50.o 
nouveau-y += core/engine/dmaobj/nvc0.o

nouveau-y += core/engine/dmaobj/nvd0.o

nouveau-y += core/engine/bsp/nv84.o

nouveau-y += core/engine/bsp/nvc0.o

nouveau-y += core/engine/bsp/nve0.o

nouveau-y += core/engine/copy/nva3.o

nouveau-y += core/engine/copy/nvc0.o

drivers/gpu/drm/nouveau/core/engine/bsp/nvc0.c

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

 * Copyright 2012 Maarten Lankhorst

 *

 * 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: Maarten Lankhorst

 */



#include <core/falcon.h>



#include <engine/bsp.h>



struct nvc0_bsp_priv {

	struct nouveau_falcon base;

};



/*******************************************************************************

 * BSP object classes

 ******************************************************************************/



static struct nouveau_oclass

nvc0_bsp_sclass[] = {

	{ 0x90b1, &nouveau_object_ofuncs },

	{},

};



/*******************************************************************************

 * PBSP context

 ******************************************************************************/



static struct nouveau_oclass

nvc0_bsp_cclass = {

	.handle = NV_ENGCTX(BSP, 0xc0),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = _nouveau_falcon_context_ctor,

		.dtor = _nouveau_falcon_context_dtor,

		.init = _nouveau_falcon_context_init,

		.fini = _nouveau_falcon_context_fini,

		.rd32 = _nouveau_falcon_context_rd32,

		.wr32 = _nouveau_falcon_context_wr32,

	},

};



/*******************************************************************************

 * PBSP engine/subdev functions

 ******************************************************************************/



static int

nvc0_bsp_init(struct nouveau_object *object)

{

	struct nvc0_bsp_priv *priv = (void *)object;

	int ret;



	ret = nouveau_falcon_init(&priv->base);

	if (ret)

		return ret;



	nv_wr32(priv, 0x084010, 0x0000fff2);

	nv_wr32(priv, 0x08401c, 0x0000fff2);

	return 0;

}



static int

nvc0_bsp_ctor(struct nouveau_object *parent, struct nouveau_object *engine,

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

	      struct nouveau_object **pobject)

{

	struct nvc0_bsp_priv *priv;

	int ret;



	ret = nouveau_falcon_create(parent, engine, oclass, 0x084000, true,

				    "PBSP", "bsp", &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;



	nv_subdev(priv)->unit = 0x00008000;

	nv_engine(priv)->cclass = &nvc0_bsp_cclass;

	nv_engine(priv)->sclass = nvc0_bsp_sclass;

	return 0;

}



struct nouveau_oclass

nvc0_bsp_oclass = {

	.handle = NV_ENGINE(BSP, 0xc0),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nvc0_bsp_ctor,

		.dtor = _nouveau_falcon_dtor,

		.init = nvc0_bsp_init,

		.fini = _nouveau_falcon_fini,

		.rd32 = _nouveau_falcon_rd32,

		.wr32 = _nouveau_falcon_wr32,

	},

};

drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c

+10 −1
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ nvc0_fifo_context_attach(struct nouveau_object *parent, 
	case NVDEV_ENGINE_GR   : addr = 0x0210; break;

	case NVDEV_ENGINE_COPY0: addr = 0x0230; break;

	case NVDEV_ENGINE_COPY1: addr = 0x0240; break;

	case NVDEV_ENGINE_BSP  : addr = 0x0270; break;

	case NVDEV_ENGINE_VP   : addr = 0x0250; break;

	case NVDEV_ENGINE_PPP  : addr = 0x0260; break;

	default:

		return -EINVAL;

	}
@@ -137,6 +140,9 @@ nvc0_fifo_context_detach(struct nouveau_object *parent, bool suspend, 
	case NVDEV_ENGINE_GR   : addr = 0x0210; break;

	case NVDEV_ENGINE_COPY0: addr = 0x0230; break;

	case NVDEV_ENGINE_COPY1: addr = 0x0240; break;

	case NVDEV_ENGINE_BSP  : addr = 0x0270; break;

	case NVDEV_ENGINE_VP   : addr = 0x0250; break;

	case NVDEV_ENGINE_PPP  : addr = 0x0260; break;

	default:

		return -EINVAL;

	}
@@ -178,7 +184,10 @@ nvc0_fifo_chan_ctor(struct nouveau_object *parent, 
					  (1 << NVDEV_ENGINE_SW) |

					  (1 << NVDEV_ENGINE_GR) |

					  (1 << NVDEV_ENGINE_COPY0) |

					  (1 << NVDEV_ENGINE_COPY1), &chan);

					  (1 << NVDEV_ENGINE_COPY1) |

					  (1 << NVDEV_ENGINE_BSP) |

					  (1 << NVDEV_ENGINE_VP) |

					  (1 << NVDEV_ENGINE_PPP), &chan);

	*pobject = nv_object(chan);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/core/include/engine/bsp.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __NOUVEAU_BSP_H__



extern struct nouveau_oclass nv84_bsp_oclass;

extern struct nouveau_oclass nvc0_bsp_oclass;

extern struct nouveau_oclass nve0_bsp_oclass;



#endif

drivers/gpu/drm/nouveau/core/subdev/device/nvc0.c

+8 −8
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nvc0_graph_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nv84_vp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nvc0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;

		device->oclass[NVDEV_ENGINE_COPY0  ] = &nvc0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nvc0_copy1_oclass;
@@ -103,7 +103,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nvc0_graph_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nv84_vp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nvc0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;

		device->oclass[NVDEV_ENGINE_COPY0  ] = &nvc0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nvc0_copy1_oclass;
@@ -131,7 +131,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nvc0_graph_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nv84_vp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nvc0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;

		device->oclass[NVDEV_ENGINE_COPY0  ] = &nvc0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nvc0_copy1_oclass;
@@ -159,7 +159,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nvc0_graph_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nv84_vp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nvc0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;

		device->oclass[NVDEV_ENGINE_COPY0  ] = &nvc0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nvc0_copy1_oclass;
@@ -187,7 +187,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nvc0_graph_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nv84_vp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nvc0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;

		device->oclass[NVDEV_ENGINE_COPY0  ] = &nvc0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nvc0_copy1_oclass;
@@ -215,7 +215,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nvc0_graph_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nv84_vp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nvc0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;

		device->oclass[NVDEV_ENGINE_COPY0  ] = &nvc0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nvc0_copy1_oclass;
@@ -243,7 +243,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nvc0_graph_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nv84_vp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nvc0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;

		device->oclass[NVDEV_ENGINE_COPY0  ] = &nvc0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nvc0_copy1_oclass;
@@ -271,7 +271,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nvc0_graph_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nv84_vp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nvc0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;

		device->oclass[NVDEV_ENGINE_COPY0  ] = &nvc0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] = &nvd0_disp_oclass;