diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:16 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:34 +1000 |
| commit | 89c651e2213a148d19407109051abbf81328a4a8 (patch) | |
| tree | c491408991c4fc895302b92aa3f00746a5cf11a5 /drivers/gpu/drm/nouveau/nvkm/engine/pm | |
| parent | drm/nouveau/subdev: rename some functions to avoid upcoming conflicts (diff) | |
| download | linux-dev-89c651e2213a148d19407109051abbf81328a4a8.tar.xz linux-dev-89c651e2213a148d19407109051abbf81328a4a8.zip | |
drm/nouveau/engine: rename some functions to avoid upcoming conflicts
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/pm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c index ac27f511163a..a441fd3b69bc 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c @@ -813,14 +813,14 @@ int _nvkm_pm_fini(struct nvkm_object *object, bool suspend) { struct nvkm_pm *pm = (void *)object; - return nvkm_engine_fini(&pm->engine, suspend); + return nvkm_engine_fini_old(&pm->engine, suspend); } int _nvkm_pm_init(struct nvkm_object *object) { struct nvkm_pm *pm = (void *)object; - return nvkm_engine_init(&pm->engine); + return nvkm_engine_init_old(&pm->engine); } void |