Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c9072e8 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

media: coda: move framebuffer size calculation out of loop 



All internal YCbCr frame buffers are the same size, calculate ycbcr_size
once before the allocation loop.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 256bf813

drivers/media/platform/coda/coda-bit.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -391,7 +391,7 @@ static int coda_alloc_framebuffers(struct coda_ctx *ctx, 
{

{

	struct coda_dev *dev = ctx->dev;

	struct coda_dev *dev = ctx->dev;

	int width, height;

	int width, height;

	int ysize;

	unsigned int ysize, ycbcr_size;

	int ret;

	int ret;

	int i;

	int i;
@@ -407,15 +407,16 @@ static int coda_alloc_framebuffers(struct coda_ctx *ctx, 
	}

	}

	ysize = width * height;

	ysize = width * height;





	if (ctx->tiled_map_type == GDI_TILED_FRAME_MB_RASTER_MAP)

		ycbcr_size = round_up(ysize, 4096) + ysize / 2;

	else

		ycbcr_size = ysize + ysize / 2;



	/* Allocate frame buffers */

	/* Allocate frame buffers */

	for (i = 0; i < ctx->num_internal_frames; i++) {

	for (i = 0; i < ctx->num_internal_frames; i++) {

		size_t size;

		size_t size = ycbcr_size;

		char *name;

		char *name;





		if (ctx->tiled_map_type == GDI_TILED_FRAME_MB_RASTER_MAP)

			size = round_up(ysize, 4096) + ysize / 2;

		else

			size = ysize + ysize / 2;

		/* Add space for mvcol buffers */

		/* Add space for mvcol buffers */

		if (dev->devtype->product != CODA_DX6 &&

		if (dev->devtype->product != CODA_DX6 &&

		    (ctx->codec->src_fourcc == V4L2_PIX_FMT_H264 ||

		    (ctx->codec->src_fourcc == V4L2_PIX_FMT_H264 ||