[PATCHv5 30/34] drm/arm/malidp: Integrate verify functions

[Andrzej Pietrasiewicz]

The next step towards using generic afbc-aware helpers.

Signed-off-by: Andrzej Pietrasiewicz <andrze...@collabora.com>
---
 drivers/gpu/drm/arm/malidp_drv.c | 36 ++++++++------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index 961e5a3f5b08..e1502666bce0 100644
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -270,9 +270,16 @@ static const struct drm_mode_config_helper_funcs 
malidp_mode_config_helpers = {
 };
 
 static bool
-malidp_verify_afbc_framebuffer_caps(struct drm_device *dev,
-                                   const struct drm_mode_fb_cmd2 *mode_cmd)
+malidp_verify_afbc_framebuffer(struct drm_device *dev, struct drm_file *file,
+                              const struct drm_mode_fb_cmd2 *mode_cmd)
 {
+       int n_superblocks = 0;
+       const struct drm_format_info *info;
+       struct drm_gem_object *objs = NULL;
+       u32 afbc_superblock_size = 0, afbc_superblock_height = 0;
+       u32 afbc_superblock_width = 0, afbc_size = 0;
+       int bpp = 0;
+
        if (malidp_format_mod_supported(dev, mode_cmd->pixel_format,
                                        mode_cmd->modifier[0]) == false)
                return false;
@@ -294,21 +301,6 @@ malidp_verify_afbc_framebuffer_caps(struct drm_device *dev,
                return false;
        }
 
-       return true;
-}
-
-static bool
-malidp_verify_afbc_framebuffer_size(struct drm_device *dev,
-                                   struct drm_file *file,
-                                   const struct drm_mode_fb_cmd2 *mode_cmd)
-{
-       int n_superblocks = 0;
-       const struct drm_format_info *info;
-       struct drm_gem_object *objs = NULL;
-       u32 afbc_superblock_size = 0, afbc_superblock_height = 0;
-       u32 afbc_superblock_width = 0, afbc_size = 0;
-       int bpp = 0;
-
        switch (mode_cmd->modifier[0] & AFBC_SIZE_MASK) {
        case AFBC_SIZE_16X16:
                afbc_superblock_height = 16;
@@ -358,16 +350,6 @@ malidp_verify_afbc_framebuffer_size(struct drm_device *dev,
        return true;
 }
 
-static bool
-malidp_verify_afbc_framebuffer(struct drm_device *dev, struct drm_file *file,
-                              const struct drm_mode_fb_cmd2 *mode_cmd)
-{
-       if (!malidp_verify_afbc_framebuffer_caps(dev, mode_cmd))
-               return false;
-
-       return malidp_verify_afbc_framebuffer_size(dev, file, mode_cmd);
-}
-
 static struct drm_framebuffer *
 malidp_fb_create(struct drm_device *dev, struct drm_file *file,
                 const struct drm_mode_fb_cmd2 *mode_cmd)
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel