drm: renesas: shmobile: Unify plane allocation

Unify primary and overlay plane allocation:
  - Enhance shmob_drm_plane_create() so it can be used to create the
    primary plane, too,
  - Move overlay plane creation next to primary plane creation.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/adbc5febc0099fd1910f32a7af1c8e0f570f74b4.1694767209.git.geert+renesas@glider.be

diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
index caafd04acd3d46d00d90f41136f65a6ff89b2f5a..564051b505ed4ac5c4c54ece8360d2653f530f0f 100644 (file)
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
@@ -19,7 +19,6 @@
 #include <drm/drm_gem_dma_helper.h>
 #include <drm/drm_modeset_helper.h>
 #include <drm/drm_modeset_helper_vtables.h>
-#include <drm/drm_plane_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_simple_kms_helper.h>
 #include <drm/drm_vblank.h>
@@ -453,47 +452,29 @@ static const struct drm_crtc_funcs crtc_funcs = {
        .disable_vblank = shmob_drm_disable_vblank,
 };
 
-static const uint32_t modeset_formats[] = {
-       DRM_FORMAT_RGB565,
-       DRM_FORMAT_RGB888,
-       DRM_FORMAT_ARGB8888,
-       DRM_FORMAT_XRGB8888,
-       DRM_FORMAT_NV12,
-       DRM_FORMAT_NV21,
-       DRM_FORMAT_NV16,
-       DRM_FORMAT_NV61,
-       DRM_FORMAT_NV24,
-       DRM_FORMAT_NV42,
-};
-
-static const struct drm_plane_funcs primary_plane_funcs = {
-       DRM_PLANE_NON_ATOMIC_FUNCS,
-};
-
 int shmob_drm_crtc_create(struct shmob_drm_device *sdev)
 {
        struct drm_crtc *crtc = &sdev->crtc.crtc;
-       struct drm_plane *primary;
+       struct drm_plane *primary, *plane;
+       unsigned int i;
        int ret;
 
        sdev->crtc.dpms = DRM_MODE_DPMS_OFF;
 
-       primary = __drm_universal_plane_alloc(&sdev->ddev, sizeof(*primary), 0,
-                                             0, &primary_plane_funcs,
-                                             modeset_formats,
-                                             ARRAY_SIZE(modeset_formats),
-                                             NULL, DRM_PLANE_TYPE_PRIMARY,
-                                             NULL);
+       primary = shmob_drm_plane_create(sdev, DRM_PLANE_TYPE_PRIMARY, 0);
        if (IS_ERR(primary))
                return PTR_ERR(primary);
 
+       for (i = 1; i < 5; ++i) {
+               plane = shmob_drm_plane_create(sdev, DRM_PLANE_TYPE_OVERLAY, i);
+               if (IS_ERR(plane))
+                       return PTR_ERR(plane);
+       }
+
        ret = drm_crtc_init_with_planes(&sdev->ddev, crtc, primary, NULL,
                                        &crtc_funcs, NULL);
-       if (ret < 0) {
-               drm_plane_cleanup(primary);
-               kfree(primary);
+       if (ret < 0)
                return ret;
-       }
 
        drm_crtc_helper_add(crtc, &crtc_helper_funcs);
 

diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
index a971c7bc1fd4b4be52eb05b7b42ec1368aa28c95..0db41c6317109773d4ce89face4d76b70a662d97 100644 (file)
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
@@ -180,7 +180,6 @@ static int shmob_drm_probe(struct platform_device *pdev)
        struct shmob_drm_platform_data *pdata = pdev->dev.platform_data;
        struct shmob_drm_device *sdev;
        struct drm_device *ddev;
-       unsigned int i;
        int ret;
 
        if (pdata == NULL) {
@@ -221,14 +220,6 @@ static int shmob_drm_probe(struct platform_device *pdev)
                return dev_err_probe(&pdev->dev, ret,
                                     "failed to initialize mode setting\n");
 
-       for (i = 0; i < 4; ++i) {
-               ret = shmob_drm_plane_create(sdev, i);
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "failed to create plane %u\n", i);
-                       goto err_modeset_cleanup;
-               }
-       }
-
        ret = drm_vblank_init(ddev, 1);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to initialize vblank\n");

diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c
index c58b9dca34736342e772de6834b579427b20f5b6..3518f8900c0d1f9ed05a06b7da2aacb25828f8dd 100644 (file)
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c
@@ -12,6 +12,7 @@
 #include <drm/drm_fourcc.h>
 #include <drm/drm_framebuffer.h>
 #include <drm/drm_gem_dma_helper.h>
+#include <drm/drm_plane_helper.h>
 
 #include "shmob_drm_drv.h"
 #include "shmob_drm_kms.h"
@@ -179,7 +180,12 @@ static int shmob_drm_plane_disable(struct drm_plane *plane,
        return 0;
 }
 
-static const struct drm_plane_funcs shmob_drm_plane_funcs = {
+static const struct drm_plane_funcs shmob_drm_primary_plane_funcs = {
+       .update_plane = drm_plane_helper_update_primary,
+       .disable_plane = drm_plane_helper_disable_primary,
+};
+
+static const struct drm_plane_funcs shmob_drm_overlay_plane_funcs = {
        .update_plane = shmob_drm_plane_update,
        .disable_plane = shmob_drm_plane_disable,
 };
@@ -197,19 +203,28 @@ static const uint32_t formats[] = {
        DRM_FORMAT_NV42,
 };
 
-int shmob_drm_plane_create(struct shmob_drm_device *sdev, unsigned int index)
+struct drm_plane *shmob_drm_plane_create(struct shmob_drm_device *sdev,
+                                        enum drm_plane_type type,
+                                        unsigned int index)
 {
+       const struct drm_plane_funcs *funcs;
        struct shmob_drm_plane *splane;
 
-       splane = drmm_universal_plane_alloc(&sdev->ddev, struct shmob_drm_plane,
-                                           plane, 1, &shmob_drm_plane_funcs,
-                                           formats, ARRAY_SIZE(formats), NULL,
-                                           DRM_PLANE_TYPE_OVERLAY, NULL);
+       if (type == DRM_PLANE_TYPE_PRIMARY)
+               funcs = &shmob_drm_primary_plane_funcs;
+       else
+               funcs = &shmob_drm_overlay_plane_funcs;
+
+       splane = drmm_universal_plane_alloc(&sdev->ddev,
+                                           struct shmob_drm_plane, plane, 1,
+                                           funcs, formats,
+                                           ARRAY_SIZE(formats),  NULL, type,
+                                           NULL);
        if (IS_ERR(splane))
-               return PTR_ERR(splane);
+               return ERR_CAST(splane);
 
        splane->index = index;
        splane->alpha = 255;
 
-       return 0;
+       return &splane->plane;
 }

diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.h
index e72b21a4288fc23f8da1a19eff6a0edf3d36a4c3..8ad12129014016fae1f85eaad9f00790be566b53 100644 (file)
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.h
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.h
@@ -13,7 +13,9 @@
 struct drm_plane;
 struct shmob_drm_device;
 
-int shmob_drm_plane_create(struct shmob_drm_device *sdev, unsigned int index);
+struct drm_plane *shmob_drm_plane_create(struct shmob_drm_device *sdev,
+                                        enum drm_plane_type type,
+                                        unsigned int index);
 void shmob_drm_plane_setup(struct drm_plane *plane);
 
 #endif /* __SHMOB_DRM_PLANE_H__ */