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

Commit 84cb7be4 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] vivid: don't use more than 1024 bytes of stack 



Remove the following compilation warnings:

	drivers/media/platform/vivid/vivid-tpg.c: In function 'tpg_gen_text':
	drivers/media/platform/vivid/vivid-tpg.c:1562:1: warning: the frame size of 1308 bytes is larger than 1024 bytes [-Wframe-larger-than=]
	 }
	 ^

This seems to be due to some bad optimization done by gcc.

Moving the for() loop to happen inside the macro solves the
issue.

While here, fix CodingStyle at the switch().

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
parent 1d03deff

drivers/media/platform/vivid/vivid-tpg.c

+17 −16
Original line number Diff line number Diff line
@@ -1492,12 +1492,10 @@ void tpg_gen_text(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2], 
	else if (tpg->field == V4L2_FIELD_SEQ_TB || tpg->field == V4L2_FIELD_SEQ_BT)

		div = 2;



	for (p = 0; p < tpg->planes; p++) {

		unsigned vdiv = tpg->vdownsampling[p];

		unsigned hdiv = tpg->hdownsampling[p];



	/* Print text */

#define PRINTSTR(PIXTYPE) do {	\

#define PRINTSTR(PIXTYPE) for (p = 0; p < tpg->planes; p++) {	\

	unsigned vdiv = tpg->vdownsampling[p];	\

	unsigned hdiv = tpg->hdownsampling[p];	\

	PIXTYPE fg;	\

	PIXTYPE bg;	\

	memcpy(&fg, tpg->textfg[p], sizeof(PIXTYPE));	\
@@ -1550,14 +1548,17 @@ void tpg_gen_text(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2], 


	switch (tpg->twopixelsize[p]) {

	case 2:

			PRINTSTR(u8); break;

		PRINTSTR(u8);

		break;

	case 4:

			PRINTSTR(u16); break;

		PRINTSTR(u16);

		break;

	case 6:

			PRINTSTR(x24); break;

		PRINTSTR(x24);

		break;

	case 8:

			PRINTSTR(u32); break;

		}

		PRINTSTR(u32);

		break;

	}

}