Commit 6fae100e authored by Bingbu Cao's avatar Bingbu Cao Committed by Mauro Carvalho Chehab
Browse files

media: staging/intel-ipu3: update minimal GDC envelope size to 4 



The ipu3 GDC function need some envelope to do filtering and the
minimal envelope size(GDC in - out) for ipu3 should be 4.
Current value 4 was defined for older version GDC, this patch
correct it.

Signed-off-by: default avatarBingbu Cao <bingbu.cao@intel.com>
Reviewed-by: default avatarTomasz Figa <tfiga@chromium.org>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent a1038ee8

drivers/staging/media/ipu3/ipu3-css.c

+6 −8
Original line number Diff line number Diff line
@@ -24,9 +24,8 @@ 
#define IPU3_CSS_MAX_H		3136

#define IPU3_CSS_MAX_W		4224



/* filter size from graph settings is fixed as 4 */

#define FILTER_SIZE             4

#define MIN_ENVELOPE            8

/* minimal envelope size(GDC in - out) should be 4 */

#define MIN_ENVELOPE            4



/*

 * pre-allocated buffer size for CSS ABI, auxiliary frames
@@ -1827,9 +1826,9 @@ int imgu_css_fmt_try(struct imgu_css *css, 
	vf->width   = imgu_css_adjust(vf->width, VF_ALIGN_W);

	vf->height  = imgu_css_adjust(vf->height, 1);



	s = (bds->width - gdc->width) / 2 - FILTER_SIZE;

	s = (bds->width - gdc->width) / 2;

	env->width = s < MIN_ENVELOPE ? MIN_ENVELOPE : s;

	s = (bds->height - gdc->height) / 2 - FILTER_SIZE;

	s = (bds->height - gdc->height) / 2;

	env->height = s < MIN_ENVELOPE ? MIN_ENVELOPE : s;



	ret = imgu_css_find_binary(css, pipe, q, r);
@@ -2251,9 +2250,8 @@ int imgu_css_set_parameters(struct imgu_css *css, unsigned int pipe, 
				css_pipe->aux_frames[a].height,

				css_pipe->rect[g].width,

				css_pipe->rect[g].height,

				css_pipe->rect[e].width + FILTER_SIZE,

				css_pipe->rect[e].height +

				FILTER_SIZE);

				css_pipe->rect[e].width,

				css_pipe->rect[e].height);

		}

	}