diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/falcon.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h index bd38cf9130fc..d811db7dbfd8 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h @@ -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)); \ diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c index 2d2e549c2e34..7791428fcafb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c @@ -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; } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c index f6e9ae95c822..90175ab62e54 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c @@ -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 |