From 47e7df39d9fb74fa11bd4b4453fc34d231b2169c Mon Sep 17 00:00:00 2001 From: Vince Hsu Date: Mon, 22 Dec 2014 17:11:38 +0800 Subject: 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 Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/core/subdev/pwr/base.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/pwr/priv.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/drm/nouveau/core/subdev/pwr') diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/base.c b/drivers/gpu/drm/nouveau/core/subdev/pwr/base.c index 0ab55f27ec45..1ea433a5e118 100644 --- 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 3814a341db32..86149d9a440c 100644 --- 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; -- cgit v1.2.3-59-g8ed1b