| Message ID | 1550141817-25453-1-git-send-email-bingbu.cao@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media:staging/intel-ipu3: update minimal GDC envelope size to 4 | expand |
Hi Bingbu, On Thu, Feb 14, 2019 at 7:50 PM <bingbu.cao@intel.com> wrote: > > From: Bingbu Cao <bingbu.cao@intel.com> > > 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: Bingbu Cao <bingbu.cao@intel.com> > --- > drivers/staging/media/ipu3/ipu3-css.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/drivers/staging/media/ipu3/ipu3-css.c b/drivers/staging/media/ipu3/ipu3-css.c > index 44c55639389a..8864206fd7e3 100644 > --- a/drivers/staging/media/ipu3/ipu3-css.c > +++ b/drivers/staging/media/ipu3/ipu3-css.c > @@ -23,9 +23,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 > @@ -1821,9 +1820,9 @@ int ipu3_css_fmt_try(struct ipu3_css *css, > vf->width = ipu3_css_adjust(vf->width, VF_ALIGN_W); > vf->height = ipu3_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; > > css->pipes[pipe].bindex = > @@ -2245,9 +2244,8 @@ int ipu3_css_set_parameters(struct ipu3_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); > } > } > > -- > 1.9.1 > Reviewed-by: Tomasz Figa <tfiga@chromium.org> Best regards, Tomasz
diff --git a/drivers/staging/media/ipu3/ipu3-css.c b/drivers/staging/media/ipu3/ipu3-css.c index 44c55639389a..8864206fd7e3 100644 --- a/drivers/staging/media/ipu3/ipu3-css.c +++ b/drivers/staging/media/ipu3/ipu3-css.c @@ -23,9 +23,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 @@ -1821,9 +1820,9 @@ int ipu3_css_fmt_try(struct ipu3_css *css, vf->width = ipu3_css_adjust(vf->width, VF_ALIGN_W); vf->height = ipu3_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; css->pipes[pipe].bindex = @@ -2245,9 +2244,8 @@ int ipu3_css_set_parameters(struct ipu3_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); } }