drm/mediatek: don't open-code drm_gem_fb_create

Aside: There's a few other fb_create implementations which
simply check for valid buffer format (or an approximation thereof),
and then call drm_gem_fb_create. For atomic drivers at least we could
walk all planes and make sure the format/modifier combo is valid,
and remove even more code.

For non-atomic drivers that's not possible, since the format list for
the primary buffer might be garbage (and most likely it is).

Also delete mtk_drm_fb.[hc] since it would now only contain one
function.

Acked-by: CK Hu <ck.hu@mediatek.com>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20191115092120.4445-4-daniel.vetter@ffwll.ch

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 84d1421..2b1c122 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -16,8 +16,10 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_of.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_vblank.h>
@@ -27,7 +29,6 @@
 #include "mtk_drm_ddp.h"
 #include "mtk_drm_ddp_comp.h"
 #include "mtk_drm_drv.h"
-#include "mtk_drm_fb.h"
 #include "mtk_drm_gem.h"
 
 #define DRIVER_NAME "mediatek"
@@ -115,6 +116,19 @@ static int mtk_atomic_commit(struct drm_device *drm,
        return 0;
 }
 
+static struct drm_framebuffer *
+mtk_drm_mode_fb_create(struct drm_device *dev,
+                      struct drm_file *file,
+                      const struct drm_mode_fb_cmd2 *cmd)
+{
+       const struct drm_format_info *info = drm_get_format_info(dev, cmd);
+
+       if (info->num_planes != 1)
+               return ERR_PTR(-EINVAL);
+
+       return drm_gem_fb_create(dev, file, cmd);
+}
+
 static const struct drm_mode_config_funcs mtk_drm_mode_config_funcs = {
        .fb_create = mtk_drm_mode_fb_create,
        .atomic_check = drm_atomic_helper_check,

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.c b/drivers/gpu/drm/mediatek/mtk_drm_fb.c
deleted file mode 100644 (file)
index 3f230a2..0000000
--- a/drivers/gpu/drm/mediatek/mtk_drm_fb.c
+++ /dev/null
@@ -1,92 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2015 MediaTek Inc.
- */
-
-#include <linux/dma-buf.h>
-#include <linux/dma-resv.h>
-
-#include <drm/drm_modeset_helper.h>
-#include <drm/drm_fb_helper.h>
-#include <drm/drm_fourcc.h>
-#include <drm/drm_gem.h>
-#include <drm/drm_gem_framebuffer_helper.h>
-
-#include "mtk_drm_drv.h"
-#include "mtk_drm_fb.h"
-#include "mtk_drm_gem.h"
-
-static const struct drm_framebuffer_funcs mtk_drm_fb_funcs = {
-       .create_handle = drm_gem_fb_create_handle,
-       .destroy = drm_gem_fb_destroy,
-};
-
-static struct drm_framebuffer *mtk_drm_framebuffer_init(struct drm_device *dev,
-                                       const struct drm_mode_fb_cmd2 *mode,
-                                       struct drm_gem_object *obj)
-{
-       const struct drm_format_info *info = drm_get_format_info(dev, mode);
-       struct drm_framebuffer *fb;
-       int ret;
-
-       if (info->num_planes != 1)
-               return ERR_PTR(-EINVAL);
-
-       fb = kzalloc(sizeof(*fb), GFP_KERNEL);
-       if (!fb)
-               return ERR_PTR(-ENOMEM);
-
-       drm_helper_mode_fill_fb_struct(dev, fb, mode);
-
-       fb->obj[0] = obj;
-
-       ret = drm_framebuffer_init(dev, fb, &mtk_drm_fb_funcs);
-       if (ret) {
-               DRM_ERROR("failed to initialize framebuffer\n");
-               kfree(fb);
-               return ERR_PTR(ret);
-       }
-
-       return fb;
-}
-
-struct drm_framebuffer *mtk_drm_mode_fb_create(struct drm_device *dev,
-                                              struct drm_file *file,
-                                              const struct drm_mode_fb_cmd2 *cmd)
-{
-       const struct drm_format_info *info = drm_get_format_info(dev, cmd);
-       struct drm_framebuffer *fb;
-       struct drm_gem_object *gem;
-       unsigned int width = cmd->width;
-       unsigned int height = cmd->height;
-       unsigned int size, bpp;
-       int ret;
-
-       if (info->num_planes != 1)
-               return ERR_PTR(-EINVAL);
-
-       gem = drm_gem_object_lookup(file, cmd->handles[0]);
-       if (!gem)
-               return ERR_PTR(-ENOENT);
-
-       bpp = info->cpp[0];
-       size = (height - 1) * cmd->pitches[0] + width * bpp;
-       size += cmd->offsets[0];
-
-       if (gem->size < size) {
-               ret = -EINVAL;
-               goto unreference;
-       }
-
-       fb = mtk_drm_framebuffer_init(dev, cmd, gem);
-       if (IS_ERR(fb)) {
-               ret = PTR_ERR(fb);
-               goto unreference;
-       }
-
-       return fb;
-
-unreference:
-       drm_gem_object_put_unlocked(gem);
-       return ERR_PTR(ret);
-}

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.h b/drivers/gpu/drm/mediatek/mtk_drm_fb.h
deleted file mode 100644 (file)
index eb64d26..0000000
--- a/drivers/gpu/drm/mediatek/mtk_drm_fb.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2015 MediaTek Inc.
- */
-
-#ifndef MTK_DRM_FB_H
-#define MTK_DRM_FB_H
-
-struct drm_framebuffer *mtk_drm_mode_fb_create(struct drm_device *dev,
-                                              struct drm_file *file,
-                                              const struct drm_mode_fb_cmd2 *cmd);
-
-#endif /* MTK_DRM_FB_H */

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index 584a9ec..fbcaf37 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -13,7 +13,6 @@
 #include "mtk_drm_crtc.h"
 #include "mtk_drm_ddp_comp.h"
 #include "mtk_drm_drv.h"
-#include "mtk_drm_fb.h"
 #include "mtk_drm_gem.h"
 #include "mtk_drm_plane.h"