Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/nouveau/ce: cosmetic changes 



This is purely preparation for upcoming commits, there should be no
code changes here.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct nvkm_falcon { 
	} data;

};



#define nv_falcon(priv) (&(priv)->base)

#define nv_falcon(priv) ((struct nvkm_falcon *)priv)



#define nvkm_falcon_create(p,e,c,b,d,i,f,r)                                 \

	nvkm_falcon_create_((p), (e), (c), (b), (d), (i), (f),              \

drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/com.fuc

+4 −4
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 
 */



#ifdef GT215

.section #gt215_pce_data

.section #gt215_ce_data

#else

.section #gf100_pce_data

.section #gf100_ce_data

#endif



ctx_object:                   .b32 0
@@ -128,9 +128,9 @@ dispatch_dma: 
.b16 0x800 0



#ifdef GT215

.section #gt215_pce_code

.section #gt215_ce_code

#else

.section #gf100_pce_code

.section #gf100_ce_code

#endif



main:

drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h

+2 −2
Original line number Diff line number Diff line 
uint32_t gf100_pce_data[] = {

uint32_t gf100_ce_data[] = {

/* 0x0000: ctx_object */

	0x00000000,

/* 0x0004: ctx_query_address_high */
@@ -171,7 +171,7 @@ uint32_t gf100_pce_data[] = { 
	0x00000800,

};



uint32_t gf100_pce_code[] = {

uint32_t gf100_ce_code[] = {

/* 0x0000: main */

	0x04fe04bd,

	0x3517f000,

drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h

+2 −2
Original line number Diff line number Diff line 
uint32_t gt215_pce_data[] = {

uint32_t gt215_ce_data[] = {

/* 0x0000: ctx_object */

	0x00000000,

/* 0x0004: ctx_dma */
@@ -183,7 +183,7 @@ uint32_t gt215_pce_data[] = { 
	0x00000800,

};



uint32_t gt215_pce_code[] = {

uint32_t gt215_ce_code[] = {

/* 0x0000: main */

	0x04fe04bd,

	0x3517f000,

drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c

+25 −29
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ 
#include <engine/falcon.h>

#include "fuc/gf100.fuc3.h"



struct gf100_ce_priv {

	struct nvkm_falcon base;

};



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

 * Copy object classes

 ******************************************************************************/
@@ -78,14 +74,14 @@ gf100_ce1_cclass = { 
static int

gf100_ce_init(struct nvkm_object *object)

{

	struct gf100_ce_priv *priv = (void *)object;

	struct nvkm_falcon *ce = (void *)object;

	int ret;



	ret = nvkm_falcon_init(&priv->base);

	ret = nvkm_falcon_init(ce);

	if (ret)

		return ret;



	nv_wo32(priv, 0x084, nv_engidx(&priv->base.engine) - NVDEV_ENGINE_CE0);

	nv_wo32(ce, 0x084, nv_engidx(&ce->engine) - NVDEV_ENGINE_CE0);

	return 0;

}
@@ -94,23 +90,23 @@ gf100_ce0_ctor(struct nvkm_object *parent, struct nvkm_object *engine, 
	       struct nvkm_oclass *oclass, void *data, u32 size,

	       struct nvkm_object **pobject)

{

	struct gf100_ce_priv *priv;

	struct nvkm_falcon *ce;

	int ret;



	ret = nvkm_falcon_create(parent, engine, oclass, 0x104000, true,

				 "PCE0", "ce0", &priv);

	*pobject = nv_object(priv);

				 "PCE0", "ce0", &ce);

	*pobject = nv_object(ce);

	if (ret)

		return ret;



	nv_subdev(priv)->unit = 0x00000040;

	nv_subdev(priv)->intr = gt215_ce_intr;

	nv_engine(priv)->cclass = &gf100_ce0_cclass;

	nv_engine(priv)->sclass = gf100_ce0_sclass;

	nv_falcon(priv)->code.data = gf100_pce_code;

	nv_falcon(priv)->code.size = sizeof(gf100_pce_code);

	nv_falcon(priv)->data.data = gf100_pce_data;

	nv_falcon(priv)->data.size = sizeof(gf100_pce_data);

	nv_subdev(ce)->unit = 0x00000040;

	nv_subdev(ce)->intr = gt215_ce_intr;

	nv_engine(ce)->cclass = &gf100_ce0_cclass;

	nv_engine(ce)->sclass = gf100_ce0_sclass;

	nv_falcon(ce)->code.data = gf100_ce_code;

	nv_falcon(ce)->code.size = sizeof(gf100_ce_code);

	nv_falcon(ce)->data.data = gf100_ce_data;

	nv_falcon(ce)->data.size = sizeof(gf100_ce_data);

	return 0;

}
@@ -119,23 +115,23 @@ gf100_ce1_ctor(struct nvkm_object *parent, struct nvkm_object *engine, 
	       struct nvkm_oclass *oclass, void *data, u32 size,

	       struct nvkm_object **pobject)

{

	struct gf100_ce_priv *priv;

	struct nvkm_falcon *ce;

	int ret;



	ret = nvkm_falcon_create(parent, engine, oclass, 0x105000, true,

				 "PCE1", "ce1", &priv);

	*pobject = nv_object(priv);

				 "PCE1", "ce1", &ce);

	*pobject = nv_object(ce);

	if (ret)

		return ret;



	nv_subdev(priv)->unit = 0x00000080;

	nv_subdev(priv)->intr = gt215_ce_intr;

	nv_engine(priv)->cclass = &gf100_ce1_cclass;

	nv_engine(priv)->sclass = gf100_ce1_sclass;

	nv_falcon(priv)->code.data = gf100_pce_code;

	nv_falcon(priv)->code.size = sizeof(gf100_pce_code);

	nv_falcon(priv)->data.data = gf100_pce_data;

	nv_falcon(priv)->data.size = sizeof(gf100_pce_data);

	nv_subdev(ce)->unit = 0x00000080;

	nv_subdev(ce)->intr = gt215_ce_intr;

	nv_engine(ce)->cclass = &gf100_ce1_cclass;

	nv_engine(ce)->sclass = gf100_ce1_sclass;

	nv_falcon(ce)->code.data = gf100_ce_code;

	nv_falcon(ce)->code.size = sizeof(gf100_ce_code);

	nv_falcon(ce)->data.data = gf100_ce_data;

	nv_falcon(ce)->data.size = sizeof(gf100_ce_data);

	return 0;

}