drm/arm/malidp:- Use the newly introduced malidp_format_get_bpp() instead of relying...

Formats like DRM_FORMAT_VUY101010, DRM_FORMAT_YUV420_8BIT and
DRM_FORMAT_YUV420_10BIT are expressed in bits per pixel as they have a non
integer value of cpp (thus denoted as '0' in drm_format_info[]). Therefore,
the calculation of AFBC framebuffer size needs to use malidp_format_get_bpp().

Changes since v3 (series):
- Added the ack
- Rebased on the latest drm-misc-next

Signed-off-by: Ayan Kumar halder <ayan.halder@arm.com>
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Link: https://patchwork.freedesktop.org/patch/291766/?series=57895&rev=1

diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index c697664bc5d7410fc4d46852ea4975689d75dd5a..4106f5d393b6e5a4dcf3482c0b8fbde002d04bd1 100644 (file)
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -298,6 +298,7 @@ malidp_verify_afbc_framebuffer_size(struct drm_device *dev,
        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:
@@ -314,15 +315,19 @@ malidp_verify_afbc_framebuffer_size(struct drm_device *dev,
        n_superblocks = (mode_cmd->width / afbc_superblock_width) *
                (mode_cmd->height / afbc_superblock_height);
 
-       afbc_superblock_size = info->cpp[0] * afbc_superblock_width *
-               afbc_superblock_height;
+       bpp = malidp_format_get_bpp(info->format);
+
+       afbc_superblock_size = (bpp * afbc_superblock_width * afbc_superblock_height)
+                               / BITS_PER_BYTE;
 
        afbc_size = ALIGN(n_superblocks * AFBC_HEADER_SIZE, AFBC_SUPERBLK_ALIGNMENT);
        afbc_size += n_superblocks * ALIGN(afbc_superblock_size, AFBC_SUPERBLK_ALIGNMENT);
 
-       if (mode_cmd->width * info->cpp[0] != mode_cmd->pitches[0]) {
-               DRM_DEBUG_KMS("Invalid value of pitch (=%u) should be same as width (=%u) * cpp (=%u)\n",
-                             mode_cmd->pitches[0], mode_cmd->width, info->cpp[0]);
+       if ((mode_cmd->width * bpp) != (mode_cmd->pitches[0] * BITS_PER_BYTE)) {
+               DRM_DEBUG_KMS("Invalid value of (pitch * BITS_PER_BYTE) (=%u) "
+                             "should be same as width (=%u) * bpp (=%u)\n",
+                             (mode_cmd->pitches[0] * BITS_PER_BYTE),
+                             mode_cmd->width, bpp);
                return false;
        }