drm/vc4: Use the fbdev_cma helpers

Keep the fbdev_cma pointer around so we can use it on hotplog and close
to ensure the frame buffer console is in a useful state.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Signed-off-by: Eric Anholt <eric@anholt.net>

diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index 3c3ccffbc7f5b41b353a30b986b2ba063a096078..6e730605edccc01de7ff01fd6e3b7ca58f62ec6d 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
+#include "drm_fb_cma_helper.h"
 
 #include "vc4_drv.h"
 #include "vc4_regs.h"
@@ -49,6 +50,14 @@ static void vc4_drm_preclose(struct drm_device *dev, struct drm_file *file)
                vc4_cancel_page_flip(crtc, file);
 }
 
+static void vc4_lastclose(struct drm_device *dev)
+{
+       struct vc4_dev *vc4 = to_vc4_dev(dev);
+
+       if (vc4->fbdev)
+               drm_fbdev_cma_restore_mode(vc4->fbdev);
+}
+
 static const struct file_operations vc4_drm_fops = {
        .owner = THIS_MODULE,
        .open = drm_open,
@@ -71,6 +80,7 @@ static struct drm_driver vc4_drm_driver = {
                            DRIVER_ATOMIC |
                            DRIVER_GEM |
                            DRIVER_PRIME),
+       .lastclose = vc4_lastclose,
        .preclose = vc4_drm_preclose,
 
        .enable_vblank = vc4_enable_vblank,
@@ -199,6 +209,10 @@ static void vc4_drm_unbind(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct drm_device *drm = platform_get_drvdata(pdev);
+       struct vc4_dev *vc4 = to_vc4_dev(drm);
+
+       if (vc4->fbdev)
+               drm_fbdev_cma_fini(vc4->fbdev);
 
        drm_mode_config_cleanup(drm);
 

diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index 04dd2e24fd34ef08c98fe2ec1b5e1dc5578fef85..57f54e0990cf86a4349c75523b8dce2ad9ed4db4 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -15,6 +15,8 @@ struct vc4_dev {
        struct vc4_hdmi *hdmi;
        struct vc4_hvs *hvs;
        struct vc4_crtc *crtc[3];
+
+       struct drm_fbdev_cma *fbdev;
 };
 
 static inline struct vc4_dev *

diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index c241c8f8e682f2855fb7300fafb2272fc105b544..ee3e0040b1625e70be24c97aede5b58a89717ab5 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -21,7 +21,16 @@
 #include "drm_fb_cma_helper.h"
 #include "vc4_drv.h"
 
+static void vc4_output_poll_changed(struct drm_device *dev)
+{
+       struct vc4_dev *vc4 = to_vc4_dev(dev);
+
+       if (vc4->fbdev)
+               drm_fbdev_cma_hotplug_event(vc4->fbdev);
+}
+
 static const struct drm_mode_config_funcs vc4_mode_funcs = {
+       .output_poll_changed = vc4_output_poll_changed,
        .atomic_check = drm_atomic_helper_check,
        .atomic_commit = drm_atomic_helper_commit,
        .fb_create = drm_fb_cma_create,
@@ -29,6 +38,7 @@ static const struct drm_mode_config_funcs vc4_mode_funcs = {
 
 int vc4_kms_load(struct drm_device *dev)
 {
+       struct vc4_dev *vc4 = to_vc4_dev(dev);
        int ret;
 
        ret = drm_vblank_init(dev, dev->mode_config.num_crtc);
@@ -44,9 +54,11 @@ int vc4_kms_load(struct drm_device *dev)
 
        drm_mode_config_reset(dev);
 
-       drm_fbdev_cma_init(dev, 32,
-                          dev->mode_config.num_crtc,
-                          dev->mode_config.num_connector);
+       vc4->fbdev = drm_fbdev_cma_init(dev, 32,
+                                       dev->mode_config.num_crtc,
+                                       dev->mode_config.num_connector);
+       if (IS_ERR(vc4->fbdev))
+               vc4->fbdev = NULL;
 
        drm_kms_helper_poll_init(dev);