drm/nouveau/fb: allow chipset-specific actions for oneinit()

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

2 files changed, 9 insertions, 0 deletions

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
index 9ee587258557..f1a1a52aab12 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
@@ -98,6 +98,7 @@ static int
 nvkm_fb_oneinit(struct nvkm_subdev *subdev)
 {
         struct nvkm_fb *fb = nvkm_fb(subdev);
+
         if (fb->func->ram_new) {
                 int ret = fb->func->ram_new(fb, &fb->ram);
                 if (ret) {
@@ -105,6 +106,13 @@ nvkm_fb_oneinit(struct nvkm_subdev *subdev)
                         return ret;
                 }
         }
+
+        if (fb->func->oneinit) {
+                int ret = fb->func->oneinit(fb);
+                if (ret)
+                        return ret;
+        }
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
index 62b9feb531dc..3c5600cd8ef4 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
@@ -6,6 +6,7 @@ struct nvkm_bios;
 
 struct nvkm_fb_func {
         void *(*dtor)(struct nvkm_fb *);
+        int (*oneinit)(struct nvkm_fb *);
         void (*init)(struct nvkm_fb *);
         void (*intr)(struct nvkm_fb *);