drm/nouveau/pwr: make nouveau_pwr_pgob() non-static

The platform device does not use the common nouveau_pwr_init() to initialize
the PWR, but it does need the .pgob() be assigned to avoid NULL pointer
dereference in graph/nve4.c.

Signed-off-by: Vince Hsu <vinceh@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/base.c b/drivers/gpu/drm/nouveau/core/subdev/pwr/base.c
index 0ab55f27ec450663ac47adb53e449f1e62215a67..1ea433a5e1182a406c96d35444316589aedbe42d 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/pwr/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/base.c
@@ -26,7 +26,7 @@
 
 #include "priv.h"
 
-static void
+void
 nouveau_pwr_pgob(struct nouveau_pwr *ppwr, bool enable)
 {
        const struct nvkm_pwr_impl *impl = (void *)nv_oclass(ppwr);

diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/priv.h b/drivers/gpu/drm/nouveau/core/subdev/pwr/priv.h
index 3814a341db3282474732ebc9a8a96242d139e1e1..86149d9a440c1e4e99757bfbc729cf6862659ac5 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/pwr/priv.h
+++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/priv.h
@@ -26,6 +26,7 @@ int _nouveau_pwr_ctor(struct nouveau_object *, struct nouveau_object *,
 #define _nouveau_pwr_dtor _nouveau_subdev_dtor
 int _nouveau_pwr_init(struct nouveau_object *);
 int _nouveau_pwr_fini(struct nouveau_object *, bool);
+void nouveau_pwr_pgob(struct nouveau_pwr *ppwr, bool enable);
 
 struct nvkm_pwr_impl {
        struct nouveau_oclass base;