Hi Andrzej,
On Mon, Nov 04, 2019 at 11:12:26PM +0100, Andrzej Pietrasiewicz wrote:
> There are afbc helpers available.
>
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/arm/malidp_drv.c | 66 ++++++--------------------------
> 1 file changed, 12 insertions(+), 54 deletions(-)
>
> diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
> index 37d92a06318e..ab93588cc8eb 100644
> --- a/drivers/gpu/drm/arm/malidp_drv.c
> +++ b/drivers/gpu/drm/arm/malidp_drv.c
> @@ -15,6 +15,7 @@
> #include <linux/pm_runtime.h>
> #include <linux/debugfs.h>
>
> +#include <drm/drm_afbc.h>
> #include <drm/drm_atomic.h>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_crtc.h>
> @@ -35,8 +36,6 @@
> #include "malidp_hw.h"
>
> #define MALIDP_CONF_VALID_TIMEOUT 250
> -#define AFBC_HEADER_SIZE 16
> -#define AFBC_SUPERBLK_ALIGNMENT 128
>
> static void malidp_write_gamma_table(struct malidp_hw_device *hwdev,
> u32 data[MALIDP_COEFFTAB_NUM_COEFFS])
> @@ -277,24 +276,8 @@ malidp_verify_afbc_framebuffer_caps(struct drm_device *dev,
> mode_cmd->modifier[0]) == false)
> return false;
>
> - if (mode_cmd->offsets[0] != 0) {
> - DRM_DEBUG_KMS("AFBC buffers' plane offset should be 0\n");
> - return false;
> - }
> -
> - switch (mode_cmd->modifier[0] & AFBC_SIZE_MASK) {
> - case AFBC_SIZE_16X16:
> - if ((mode_cmd->width % 16) || (mode_cmd->height % 16)) {
> - DRM_DEBUG_KMS("AFBC buffers must be aligned to 16 pixels\n");
> - return false;
> - }
> - break;
> - default:
> - DRM_DEBUG_KMS("Unsupported AFBC block size\n");
> - return false;
> - }
> -
> - return true;
> + return drm_afbc_check_offset(dev, mode_cmd) &&
> + drm_afbc_check_size_align(dev, mode_cmd);
> }
Given that the content of this function gets copied pretty much verbatim into the new
drm_afbc.c file, I suggest you make the change in the 1/4 patch and also update the
copyright statement in that file to show that the code originated from here.
Best regards,
Liviu
>
> static bool
> @@ -302,54 +285,29 @@ 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;
> - afbc_superblock_width = 16;
> - break;
> - default:
> - DRM_DEBUG_KMS("AFBC superblock size is not supported\n");
> - return false;
> - }
> + u32 w, h;
>
> info = drm_get_format_info(dev, mode_cmd);
> -
> - n_superblocks = (mode_cmd->width / afbc_superblock_width) *
> - (mode_cmd->height / 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 * 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;
> - }
> -
> objs = drm_gem_object_lookup(file, mode_cmd->handles[0]);
> if (!objs) {
> DRM_DEBUG_KMS("Failed to lookup GEM object\n");
> return false;
> }
>
> - if (objs->size < afbc_size) {
> - DRM_DEBUG_KMS("buffer size (%zu) too small for AFBC buffer size = %u\n",
> - objs->size, afbc_size);
> + if (!drm_afbc_get_superblk_wh(mode_cmd->modifier[0], &w, &h))
> + return false;
> +
> + if (!drm_afbc_check_fb_size(mode_cmd->pitches[0], bpp,
> + mode_cmd->width, mode_cmd->height, w, h,
> + objs->size, mode_cmd->offsets[0],
> + AFBC_SUPERBLK_ALIGNMENT)) {
> drm_gem_object_put_unlocked(objs);
> +
> return false;
> }
>
> --
> 2.17.1
>
--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
