drm/nouveau/kms: Move struct nouveau_framebuffer.vma to struct nouveau_fbdev

The vma field of struct nouveau_framebuffer is a special field for the
the accelerated fbdev console. Hence there's at most one single instance
for the active console. Moving it into struct nouveau_fbdev makes struct
nouveau_framebuffer slightly smaller and brings it closer to struct
drm_framebuffer.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h b/drivers/gpu/drm/nouveau/nouveau_display.h
index 178b71ffc07c3a1d8c4598984155703f839ed118..d71de95ece7569f1b2f61e41bcebd8cc687081d8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.h
+++ b/drivers/gpu/drm/nouveau/nouveau_display.h
@@ -11,7 +11,6 @@
 struct nouveau_framebuffer {
        struct drm_framebuffer base;
        struct nouveau_bo *nvbo;
-       struct nouveau_vma *vma;
 };
 
 static inline struct nouveau_framebuffer *

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 24d543a01f435ae2bfa9861c78edc7339a2704f5..dcdabd2a1a6dbfa3386f281b1f4d74ab4c2b8508 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -353,7 +353,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_vma_new(nvbo, chan->vmm, &fb->vma);
+               ret = nouveau_vma_new(nvbo, chan->vmm, &fbcon->vma);
                if (ret) {
                        NV_ERROR(drm, "failed to map fb into chan: %d\n", ret);
                        chan = NULL;
@@ -400,7 +400,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
 
 out_unlock:
        if (chan)
-               nouveau_vma_del(&fb->vma);
+               nouveau_vma_del(&fbcon->vma);
        nouveau_bo_unmap(fb->nvbo);
 out_unpin:
        nouveau_bo_unpin(fb->nvbo);
@@ -419,7 +419,7 @@ nouveau_fbcon_destroy(struct drm_device *dev, struct nouveau_fbdev *fbcon)
        drm_fb_helper_fini(&fbcon->helper);
 
        if (nouveau_fb && nouveau_fb->nvbo) {
-               nouveau_vma_del(&nouveau_fb->vma);
+               nouveau_vma_del(&fbcon->vma);
                nouveau_bo_unmap(nouveau_fb->nvbo);
                nouveau_bo_unpin(nouveau_fb->nvbo);
                drm_framebuffer_put(&nouveau_fb->base);

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.h b/drivers/gpu/drm/nouveau/nouveau_fbcon.h
index 73a7eeba39738ee249f7baca95d26f023d34a31a..1796d8824580b14368f4b3a991241cea2700594d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.h
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.h
@@ -31,6 +31,8 @@
 
 #include "nouveau_display.h"
 
+struct nouveau_vma;
+
 struct nouveau_fbdev {
        struct drm_fb_helper helper; /* must be first */
        unsigned int saved_flags;
@@ -41,6 +43,7 @@ struct nouveau_fbdev {
        struct nvif_object gdi;
        struct nvif_object blit;
        struct nvif_object twod;
+       struct nouveau_vma *vma;
 
        struct mutex hotplug_lock;
        bool hotplug_waiting;

diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
index facd18564e0d87b1fea344875dee18117b09e499..47428f79ede8f1915629d7ecdfd2e86227094afe 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c
@@ -149,7 +149,6 @@ int
 nv50_fbcon_accel_init(struct fb_info *info)
 {
        struct nouveau_fbdev *nfbdev = info->par;
-       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;
@@ -240,8 +239,8 @@ nv50_fbcon_accel_init(struct fb_info *info)
        OUT_RING(chan, info->fix.line_length);
        OUT_RING(chan, info->var.xres_virtual);
        OUT_RING(chan, info->var.yres_virtual);
-       OUT_RING(chan, upper_32_bits(fb->vma->addr));
-       OUT_RING(chan, lower_32_bits(fb->vma->addr));
+       OUT_RING(chan, upper_32_bits(nfbdev->vma->addr));
+       OUT_RING(chan, lower_32_bits(nfbdev->vma->addr));
        BEGIN_NV04(chan, NvSub2D, 0x0230, 2);
        OUT_RING(chan, format);
        OUT_RING(chan, 1);
@@ -249,8 +248,8 @@ nv50_fbcon_accel_init(struct fb_info *info)
        OUT_RING(chan, info->fix.line_length);
        OUT_RING(chan, info->var.xres_virtual);
        OUT_RING(chan, info->var.yres_virtual);
-       OUT_RING(chan, upper_32_bits(fb->vma->addr));
-       OUT_RING(chan, lower_32_bits(fb->vma->addr));
+       OUT_RING(chan, upper_32_bits(nfbdev->vma->addr));
+       OUT_RING(chan, lower_32_bits(nfbdev->vma->addr));
        FIRE_RING(chan);
 
        return 0;

diff --git a/drivers/gpu/drm/nouveau/nvc0_fbcon.c b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
index c0deef4fe7274ff5b96ef36aaba8156e161b106c..cb56163ed6082484713613ba1b751c2605697ed1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
@@ -150,7 +150,6 @@ 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 = nouveau_framebuffer(nfbdev->helper.fb);
        struct nouveau_drm *drm = nouveau_drm(dev);
        struct nouveau_channel *chan = drm->channel;
        int ret, format;
@@ -240,8 +239,8 @@ nvc0_fbcon_accel_init(struct fb_info *info)
        OUT_RING  (chan, info->fix.line_length);
        OUT_RING  (chan, info->var.xres_virtual);
        OUT_RING  (chan, info->var.yres_virtual);
-       OUT_RING  (chan, upper_32_bits(fb->vma->addr));
-       OUT_RING  (chan, lower_32_bits(fb->vma->addr));
+       OUT_RING  (chan, upper_32_bits(nfbdev->vma->addr));
+       OUT_RING  (chan, lower_32_bits(nfbdev->vma->addr));
        BEGIN_NVC0(chan, NvSub2D, 0x0230, 10);
        OUT_RING  (chan, format);
        OUT_RING  (chan, 1);
@@ -251,8 +250,8 @@ nvc0_fbcon_accel_init(struct fb_info *info)
        OUT_RING  (chan, info->fix.line_length);
        OUT_RING  (chan, info->var.xres_virtual);
        OUT_RING  (chan, info->var.yres_virtual);
-       OUT_RING  (chan, upper_32_bits(fb->vma->addr));
-       OUT_RING  (chan, lower_32_bits(fb->vma->addr));
+       OUT_RING  (chan, upper_32_bits(nfbdev->vma->addr));
+       OUT_RING  (chan, lower_32_bits(nfbdev->vma->addr));
        FIRE_RING (chan);
 
        return 0;