evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/nouveau/falcon: cosmetic changes

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:07 +10:00
parent 6052dc5775
commit b26ada6fed
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
View file

@ -29,7 +29,7 @@ struct nvkm_falcon_data {
#include <core/engine.h> #include <core/engine.h>
struct nvkm_falcon { struct nvkm_falcon {
struct nvkm_engine base; struct nvkm_engine engine;
u32 addr; u32 addr;
u8 version; u8 version;
@ -57,7 +57,7 @@ struct nvkm_falcon {
nvkm_falcon_create_((p), (e), (c), (b), (d), (i), (f), \ nvkm_falcon_create_((p), (e), (c), (b), (d), (i), (f), \
sizeof(**r),(void **)r) sizeof(**r),(void **)r)
#define nvkm_falcon_destroy(p) \ #define nvkm_falcon_destroy(p) \
nvkm_engine_destroy(&(p)->base) nvkm_engine_destroy(&(p)->engine)
#define nvkm_falcon_init(p) ({ \ #define nvkm_falcon_init(p) ({ \
struct nvkm_falcon *falcon = (p); \ struct nvkm_falcon *falcon = (p); \
_nvkm_falcon_init(nv_object(falcon)); \ _nvkm_falcon_init(nv_object(falcon)); \

2
drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c
View file

@ -85,7 +85,7 @@ gf100_ce_init(struct nvkm_object *object)
if (ret) if (ret)
return 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; return 0;
} }

4
drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
View file

@ -77,7 +77,7 @@ _nvkm_falcon_init(struct nvkm_object *object)
u32 caps; u32 caps;
/* enable engine, and determine its capabilities */ /* enable engine, and determine its capabilities */
ret = nvkm_engine_init(&falcon->base); ret = nvkm_engine_init(&falcon->engine);
if (ret) if (ret)
return ret; return ret;
@ -253,7 +253,7 @@ _nvkm_falcon_fini(struct nvkm_object *object, bool suspend)
nv_mo32(falcon, 0x048, 0x00000003, 0x00000000); nv_mo32(falcon, 0x048, 0x00000003, 0x00000000);
nv_wo32(falcon, 0x014, 0xffffffff); nv_wo32(falcon, 0x014, 0xffffffff);
return nvkm_engine_fini(&falcon->base, suspend); return nvkm_engine_fini(&falcon->engine, suspend);
} }
int int