drm/tinydrm: Use drm_fbdev_generic_setup()

Make full use of the generic fbdev client.

Cc: David Lechner <david@lechnology.com>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: David Lechner <david@lechnology.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180703160354.59955-8-noralf@tronnes.org

diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c
index 24a33bf862fa161203893f429a09a089490b8e9f..19c7f70adfa5b7f29545108292c82cb83c6039f8 100644 (file)
--- a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c
+++ b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c
@@ -204,7 +204,7 @@ static int tinydrm_register(struct tinydrm_device *tdev)
        if (ret)
                return ret;
 
-       ret = drm_fb_cma_fbdev_init_with_funcs(drm, 0, 0, tdev->fb_funcs);
+       ret = drm_fbdev_generic_setup(drm, 0);
        if (ret)
                DRM_ERROR("Failed to initialize fbdev: %d\n", ret);
 
@@ -214,7 +214,6 @@ static int tinydrm_register(struct tinydrm_device *tdev)
 static void tinydrm_unregister(struct tinydrm_device *tdev)
 {
        drm_atomic_helper_shutdown(tdev->drm);
-       drm_fb_cma_fbdev_fini(tdev->drm);
        drm_dev_unregister(tdev->drm);
 }
 

diff --git a/drivers/gpu/drm/tinydrm/ili9225.c b/drivers/gpu/drm/tinydrm/ili9225.c
index 841c69aba0590455ddc5d5ce887f15d2a67d26c2..455fefe012f5912e825b4296e8c96b0129b814ea 100644 (file)
--- a/drivers/gpu/drm/tinydrm/ili9225.c
+++ b/drivers/gpu/drm/tinydrm/ili9225.c
@@ -368,7 +368,6 @@ static struct drm_driver ili9225_driver = {
                                  DRIVER_ATOMIC,
        .fops                   = &ili9225_fops,
        TINYDRM_GEM_DRIVER_OPS,
-       .lastclose              = drm_fb_helper_lastclose,
        .name                   = "ili9225",
        .desc                   = "Ilitek ILI9225",
        .date                   = "20171106",

diff --git a/drivers/gpu/drm/tinydrm/ili9341.c b/drivers/gpu/drm/tinydrm/ili9341.c
index 8864dcde6edca1dead08ba415648a057cb271bdb..6701037749a74f862f8993fc3c5d7c95d5c69282 100644 (file)
--- a/drivers/gpu/drm/tinydrm/ili9341.c
+++ b/drivers/gpu/drm/tinydrm/ili9341.c
@@ -145,7 +145,6 @@ static struct drm_driver ili9341_driver = {
        .driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC,
        .fops                   = &ili9341_fops,
        TINYDRM_GEM_DRIVER_OPS,
-       .lastclose              = drm_fb_helper_lastclose,
        .debugfs_init           = mipi_dbi_debugfs_init,
        .name                   = "ili9341",
        .desc                   = "Ilitek ILI9341",

diff --git a/drivers/gpu/drm/tinydrm/mi0283qt.c b/drivers/gpu/drm/tinydrm/mi0283qt.c
index 015d03f2acba87baa0f158424cbade44f7ade977..d7bb4c5e6657a723e9ae03f2cd91e043c942b847 100644 (file)
--- a/drivers/gpu/drm/tinydrm/mi0283qt.c
+++ b/drivers/gpu/drm/tinydrm/mi0283qt.c
@@ -154,7 +154,6 @@ static struct drm_driver mi0283qt_driver = {
                                  DRIVER_ATOMIC,
        .fops                   = &mi0283qt_fops,
        TINYDRM_GEM_DRIVER_OPS,
-       .lastclose              = drm_fb_helper_lastclose,
        .debugfs_init           = mipi_dbi_debugfs_init,
        .name                   = "mi0283qt",
        .desc                   = "Multi-Inno MI0283QT",

diff --git a/drivers/gpu/drm/tinydrm/st7586.c b/drivers/gpu/drm/tinydrm/st7586.c
index 5c29e3803ecba2a417f7a5d5e68c68f63738cd82..2fcbc3067d71b237d3a8a49ffd496d25367ac000 100644 (file)
--- a/drivers/gpu/drm/tinydrm/st7586.c
+++ b/drivers/gpu/drm/tinydrm/st7586.c
@@ -304,7 +304,6 @@ static struct drm_driver st7586_driver = {
                                  DRIVER_ATOMIC,
        .fops                   = &st7586_fops,
        TINYDRM_GEM_DRIVER_OPS,
-       .lastclose              = drm_fb_helper_lastclose,
        .debugfs_init           = mipi_dbi_debugfs_init,
        .name                   = "st7586",
        .desc                   = "Sitronix ST7586",

diff --git a/drivers/gpu/drm/tinydrm/st7735r.c b/drivers/gpu/drm/tinydrm/st7735r.c
index 6c7b15c9da4fc3eeac3b8d5976301c397eb85908..3081bc57c1166dc6849d24ea2abfab47d07e780b 100644 (file)
--- a/drivers/gpu/drm/tinydrm/st7735r.c
+++ b/drivers/gpu/drm/tinydrm/st7735r.c
@@ -120,7 +120,6 @@ static struct drm_driver st7735r_driver = {
                                  DRIVER_ATOMIC,
        .fops                   = &st7735r_fops,
        TINYDRM_GEM_DRIVER_OPS,
-       .lastclose              = drm_fb_helper_lastclose,
        .debugfs_init           = mipi_dbi_debugfs_init,
        .name                   = "st7735r",
        .desc                   = "Sitronix ST7735R",