drm/nouveau/fbcon: make use of drm_fb_helper.fb

Transitional step towards properly refcounting the fbcon fb.

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

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 2317447055289e0f914a905273893c22385dade9..392ed4761b7f32f5a658b36a0dd5956d7fcd9017 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -337,12 +337,11 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
        struct nouveau_drm *drm = nouveau_drm(dev);
        struct nvif_device *device = &drm->device;
        struct fb_info *info;
-       struct drm_framebuffer *fb;
-       struct nouveau_framebuffer *nouveau_fb;
+       struct nouveau_framebuffer *fb;
        struct nouveau_channel *chan;
        struct nouveau_bo *nvbo;
        struct drm_mode_fb_cmd2 mode_cmd;
-       int size, ret;
+       int ret;
 
        mode_cmd.width = sizes->surface_width;
        mode_cmd.height = sizes->surface_height;
@@ -353,16 +352,16 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
        mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
                                                          sizes->surface_depth);
 
-       size = mode_cmd.pitches[0] * mode_cmd.height;
-       size = roundup(size, PAGE_SIZE);
-
-       ret = nouveau_gem_new(dev, size, 0, NOUVEAU_GEM_DOMAIN_VRAM,
-                             0, 0x0000, &nvbo);
+       ret = nouveau_gem_new(dev, mode_cmd.pitches[0] * mode_cmd.height,
+                             0, NOUVEAU_GEM_DOMAIN_VRAM, 0, 0x0000, &nvbo);
        if (ret) {
                NV_ERROR(drm, "failed to allocate framebuffer\n");
                goto out;
        }
 
+       nouveau_framebuffer_init(dev, &fbcon->fb, &mode_cmd, nvbo);
+       fb = &fbcon->fb;
+
        ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_VRAM, false);
        if (ret) {
                NV_ERROR(drm, "failed to pin fb: %d\n", ret);
@@ -377,8 +376,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
 
        chan = nouveau_nofbaccel ? NULL : drm->channel;
        if (chan && device->info.family >= NV_DEVICE_INFO_V0_TESLA) {
-               ret = nouveau_bo_vma_add(nvbo, drm->client.vm,
-                                       &fbcon->nouveau_fb.vma);
+               ret = nouveau_bo_vma_add(nvbo, drm->client.vm, &fb->vma);
                if (ret) {
                        NV_ERROR(drm, "failed to map fb into chan: %d\n", ret);
                        chan = NULL;
@@ -394,13 +392,8 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
 
        info->par = fbcon;
 
-       nouveau_framebuffer_init(dev, &fbcon->nouveau_fb, &mode_cmd, nvbo);
-
-       nouveau_fb = &fbcon->nouveau_fb;
-       fb = &nouveau_fb->base;
-
        /* setup helper */
-       fbcon->helper.fb = fb;
+       fbcon->helper.fb = &fb->base;
 
        strcpy(info->fix.id, "nouveaufb");
        if (!chan)
@@ -411,14 +404,14 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
                              FBINFO_HWACCEL_IMAGEBLIT;
        info->flags |= FBINFO_CAN_FORCE_OUTPUT;
        info->fbops = &nouveau_fbcon_sw_ops;
-       info->fix.smem_start = nvbo->bo.mem.bus.base +
-                              nvbo->bo.mem.bus.offset;
-       info->fix.smem_len = size;
+       info->fix.smem_start = fb->nvbo->bo.mem.bus.base +
+                              fb->nvbo->bo.mem.bus.offset;
+       info->fix.smem_len = fb->nvbo->bo.mem.num_pages << PAGE_SHIFT;
 
-       info->screen_base = nvbo_kmap_obj_iovirtual(nouveau_fb->nvbo);
-       info->screen_size = size;
+       info->screen_base = nvbo_kmap_obj_iovirtual(fb->nvbo);
+       info->screen_size = fb->nvbo->bo.mem.num_pages << PAGE_SHIFT;
 
-       drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
+       drm_fb_helper_fill_fix(info, fb->base.pitches[0], fb->base.depth);
        drm_fb_helper_fill_var(info, &fbcon->helper, sizes->fb_width, sizes->fb_height);
 
        /* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
@@ -429,20 +422,19 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
 
        /* To allow resizeing without swapping buffers */
        NV_INFO(drm, "allocated %dx%d fb: 0x%llx, bo %p\n",
-               nouveau_fb->base.width, nouveau_fb->base.height,
-               nvbo->bo.offset, nvbo);
+               fb->base.width, fb->base.height, fb->nvbo->bo.offset, nvbo);
 
        vga_switcheroo_client_fb_set(dev->pdev, info);
        return 0;
 
 out_unlock:
        if (chan)
-               nouveau_bo_vma_del(nvbo, &fbcon->nouveau_fb.vma);
-       nouveau_bo_unmap(nvbo);
+               nouveau_bo_vma_del(fb->nvbo, &fb->vma);
+       nouveau_bo_unmap(fb->nvbo);
 out_unpin:
-       nouveau_bo_unpin(nvbo);
+       nouveau_bo_unpin(fb->nvbo);
 out_unref:
-       nouveau_bo_ref(NULL, &nvbo);
+       nouveau_bo_ref(NULL, &fb->nvbo);
 out:
        return ret;
 }
@@ -458,14 +450,14 @@ nouveau_fbcon_output_poll_changed(struct drm_device *dev)
 static int
 nouveau_fbcon_destroy(struct drm_device *dev, struct nouveau_fbdev *fbcon)
 {
-       struct nouveau_framebuffer *nouveau_fb = &fbcon->nouveau_fb;
+       struct nouveau_framebuffer *nouveau_fb = nouveau_framebuffer(fbcon->helper.fb);
 
        drm_fb_helper_unregister_fbi(&fbcon->helper);
        drm_fb_helper_release_fbi(&fbcon->helper);
 
        if (nouveau_fb->nvbo) {
-               nouveau_bo_unmap(nouveau_fb->nvbo);
                nouveau_bo_vma_del(nouveau_fb->nvbo, &nouveau_fb->vma);
+               nouveau_bo_unmap(nouveau_fb->nvbo);
                nouveau_bo_unpin(nouveau_fb->nvbo);
                drm_gem_object_unreference_unlocked(&nouveau_fb->nvbo->gem);
                nouveau_fb->nvbo = NULL;

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.h b/drivers/gpu/drm/nouveau/nouveau_fbcon.h
index 710064d425ad2ec99a45ab907255e8d211dfc933..35036a4baf3c088f4143369c45aa16a3f76191e0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.h
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.h
@@ -33,7 +33,7 @@
 
 struct nouveau_fbdev {
        struct drm_fb_helper helper;
-       struct nouveau_framebuffer nouveau_fb;
+       struct nouveau_framebuffer fb;
        unsigned int saved_flags;
        struct nvif_object surf2d;
        struct nvif_object clip;

diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
index 6201812cf618098e018c12a485a67078cdd18bdf..327dcd7901edf4beff9c40bc30356addb3210389 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c
@@ -148,7 +148,7 @@ int
 nv50_fbcon_accel_init(struct fb_info *info)
 {
        struct nouveau_fbdev *nfbdev = info->par;
-       struct nouveau_framebuffer *fb = &nfbdev->nouveau_fb;
+       struct nouveau_framebuffer *fb = nouveau_framebuffer(nfbdev->helper.fb);
        struct drm_device *dev = nfbdev->helper.dev;
        struct nouveau_drm *drm = nouveau_drm(dev);
        struct nouveau_channel *chan = drm->channel;

diff --git a/drivers/gpu/drm/nouveau/nvc0_fbcon.c b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
index 9a5383371c9d49a11e790bd5cd5b01683b643a2f..90f27bfa381fd4882c6836a5a7d8365781871ed8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
@@ -149,7 +149,7 @@ nvc0_fbcon_accel_init(struct fb_info *info)
 {
        struct nouveau_fbdev *nfbdev = info->par;
        struct drm_device *dev = nfbdev->helper.dev;
-       struct nouveau_framebuffer *fb = &nfbdev->nouveau_fb;
+       struct nouveau_framebuffer *fb = nouveau_framebuffer(nfbdev->helper.fb);
        struct nouveau_drm *drm = nouveau_drm(dev);
        struct nouveau_channel *chan = drm->channel;
        int ret, format;