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

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

drm/nouveau/falcon: 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 6052dc57

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

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct nvkm_falcon_data { 
#include <core/engine.h>



struct nvkm_falcon {

	struct nvkm_engine base;

	struct nvkm_engine engine;



	u32 addr;

	u8  version;
@@ -57,7 +57,7 @@ struct nvkm_falcon { 
	nvkm_falcon_create_((p), (e), (c), (b), (d), (i), (f),              \

			       sizeof(**r),(void **)r)

#define nvkm_falcon_destroy(p)                                              \

	nvkm_engine_destroy(&(p)->base)

	nvkm_engine_destroy(&(p)->engine)

#define nvkm_falcon_init(p) ({                                              \

	struct nvkm_falcon *falcon = (p);                                   \

	_nvkm_falcon_init(nv_object(falcon));                               \

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

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ gf100_ce_init(struct nvkm_object *object) 
	if (ret)

		return ret;



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

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

	return 0;

}

drivers/gpu/drm/nouveau/nvkm/engine/falcon.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ _nvkm_falcon_init(struct nvkm_object *object) 
	u32 caps;



	/* enable engine, and determine its capabilities */

	ret = nvkm_engine_init(&falcon->base);

	ret = nvkm_engine_init(&falcon->engine);

	if (ret)

		return ret;
@@ -253,7 +253,7 @@ _nvkm_falcon_fini(struct nvkm_object *object, bool suspend) 
	nv_mo32(falcon, 0x048, 0x00000003, 0x00000000);

	nv_wo32(falcon, 0x014, 0xffffffff);



	return nvkm_engine_fini(&falcon->base, suspend);

	return nvkm_engine_fini(&falcon->engine, suspend);

}



int