| Message ID | 20190909162743.30114-11-bparrot@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: am437x-vpfe: overdue maintenance | expand |
On Mon, 2019-09-09 at 11:27 -0500, Benoit Parrot wrote: > print_fourcc helper function was used for debug log the > convert a pixel format code into its readable form for display > purposes. But since it used a single static buffer to perform > the conversion this might lead to display format issue when more > than one instance was invoked simultaneously. > > It turns out that print_fourcc can be safely replace by using > "%4.4s" instead and casting the pointer to the fourcc code > into a (char *). [] > diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c [] > @@ -221,20 +221,6 @@ static void pix_to_mbus(struct vpfe_device *vpfe, [] > @@ -700,8 +686,8 @@ static int vpfe_ccdc_set_pixel_format(struct vpfe_ccdc *ccdc, u32 pixfmt) > { > struct vpfe_device *vpfe = container_of(ccdc, struct vpfe_device, ccdc); > > - vpfe_dbg(1, vpfe, "%s: if_type: %d, pixfmt:%s\n", > - __func__, ccdc->ccdc_cfg.if_type, print_fourcc(pixfmt)); > + vpfe_dbg(1, vpfe, "%s: if_type: %d, pixfmt:%4.4s\n", > + __func__, ccdc->ccdc_cfg.if_type, (char *)&pixfmt); To avoid any possible defect in the content of pixfmt, it's probably better to use vsprintf extension "%4pE", &pixfmt see: Documentation/core-api/printk-formats.rst vpfe_dbg(1, vpfe, "%s: if_type: %d, pixfmt:%4pE\n", __func__, ccdc->ccdc_cfg.if_type, &pixfmt); > > if (ccdc->ccdc_cfg.if_type == VPFE_RAW_BAYER) { > ccdc->ccdc_cfg.bayer.pix_fmt = CCDC_PIXFMT_RAW; > @@ -989,8 +975,8 @@ static int vpfe_config_ccdc_image_format(struct vpfe_device *vpfe) > > vpfe_dbg(2, vpfe, "%s:\n", __func__); > > - vpfe_dbg(1, vpfe, "pixelformat: %s\n", > - print_fourcc(vpfe->v_fmt.fmt.pix.pixelformat)); > + vpfe_dbg(1, vpfe, "pixelformat: %4.4s\n", > + (char *)&vpfe->v_fmt.fmt.pix.pixelformat); vpfe_dbg(1, vpfe, "pixelformat: %4pE\n", &vpfe->v_fmt.fmt.pix.pixelformat); etc...
Joe Perches <joe@perches.com> wrote on Mon [2019-Sep-09 09:39:37 -0700]: > On Mon, 2019-09-09 at 11:27 -0500, Benoit Parrot wrote: > > print_fourcc helper function was used for debug log the > > convert a pixel format code into its readable form for display > > purposes. But since it used a single static buffer to perform > > the conversion this might lead to display format issue when more > > than one instance was invoked simultaneously. > > > > It turns out that print_fourcc can be safely replace by using > > "%4.4s" instead and casting the pointer to the fourcc code > > into a (char *). > [] > > diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c > [] > > @@ -221,20 +221,6 @@ static void pix_to_mbus(struct vpfe_device *vpfe, > [] > > @@ -700,8 +686,8 @@ static int vpfe_ccdc_set_pixel_format(struct vpfe_ccdc *ccdc, u32 pixfmt) > > { > > struct vpfe_device *vpfe = container_of(ccdc, struct vpfe_device, ccdc); > > > > - vpfe_dbg(1, vpfe, "%s: if_type: %d, pixfmt:%s\n", > > - __func__, ccdc->ccdc_cfg.if_type, print_fourcc(pixfmt)); > > + vpfe_dbg(1, vpfe, "%s: if_type: %d, pixfmt:%4.4s\n", > > + __func__, ccdc->ccdc_cfg.if_type, (char *)&pixfmt); > > > To avoid any possible defect in the content of pixfmt, it's > probably better to use vsprintf extension "%4pE", &pixfmt > see: Documentation/core-api/printk-formats.rst > > vpfe_dbg(1, vpfe, "%s: if_type: %d, pixfmt:%4pE\n", > __func__, ccdc->ccdc_cfg.if_type, &pixfmt); > Thanks Joe, I was not aware of this feature. I'll update this patch. Benoit > > > > if (ccdc->ccdc_cfg.if_type == VPFE_RAW_BAYER) { > > ccdc->ccdc_cfg.bayer.pix_fmt = CCDC_PIXFMT_RAW; > > @@ -989,8 +975,8 @@ static int vpfe_config_ccdc_image_format(struct vpfe_device *vpfe) > > > > vpfe_dbg(2, vpfe, "%s:\n", __func__); > > > > - vpfe_dbg(1, vpfe, "pixelformat: %s\n", > > - print_fourcc(vpfe->v_fmt.fmt.pix.pixelformat)); > > + vpfe_dbg(1, vpfe, "pixelformat: %4.4s\n", > > + (char *)&vpfe->v_fmt.fmt.pix.pixelformat); > > vpfe_dbg(1, vpfe, "pixelformat: %4pE\n", > &vpfe->v_fmt.fmt.pix.pixelformat); > > etc... > >
diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c index 93f92097602c..4fb9c8ed7e92 100644 --- a/drivers/media/platform/am437x/am437x-vpfe.c +++ b/drivers/media/platform/am437x/am437x-vpfe.c @@ -221,20 +221,6 @@ static void pix_to_mbus(struct vpfe_device *vpfe, v4l2_fill_mbus_format(mbus_fmt, pix_fmt, fmt->code); } -/* Print Four-character-code (FOURCC) */ -static char *print_fourcc(u32 fmt) -{ - static char code[5]; - - code[0] = (unsigned char)(fmt & 0xff); - code[1] = (unsigned char)((fmt >> 8) & 0xff); - code[2] = (unsigned char)((fmt >> 16) & 0xff); - code[3] = (unsigned char)((fmt >> 24) & 0xff); - code[4] = '\0'; - - return code; -} - static int cmp_v4l2_format(const struct v4l2_format *lhs, const struct v4l2_format *rhs) { @@ -700,8 +686,8 @@ static int vpfe_ccdc_set_pixel_format(struct vpfe_ccdc *ccdc, u32 pixfmt) { struct vpfe_device *vpfe = container_of(ccdc, struct vpfe_device, ccdc); - vpfe_dbg(1, vpfe, "%s: if_type: %d, pixfmt:%s\n", - __func__, ccdc->ccdc_cfg.if_type, print_fourcc(pixfmt)); + vpfe_dbg(1, vpfe, "%s: if_type: %d, pixfmt:%4.4s\n", + __func__, ccdc->ccdc_cfg.if_type, (char *)&pixfmt); if (ccdc->ccdc_cfg.if_type == VPFE_RAW_BAYER) { ccdc->ccdc_cfg.bayer.pix_fmt = CCDC_PIXFMT_RAW; @@ -989,8 +975,8 @@ static int vpfe_config_ccdc_image_format(struct vpfe_device *vpfe) vpfe_dbg(2, vpfe, "%s:\n", __func__); - vpfe_dbg(1, vpfe, "pixelformat: %s\n", - print_fourcc(vpfe->v_fmt.fmt.pix.pixelformat)); + vpfe_dbg(1, vpfe, "pixelformat: %4.4s\n", + (char *)&vpfe->v_fmt.fmt.pix.pixelformat); if (vpfe_ccdc_set_pixel_format(&vpfe->ccdc, vpfe->v_fmt.fmt.pix.pixelformat) < 0) { @@ -1409,9 +1395,9 @@ static int __vpfe_get_format(struct vpfe_device *vpfe, format->type = vpfe->v_fmt.type; vpfe_dbg(1, vpfe, - "%s: size %dx%d (%s) bytesperline = %d, size = %d, bpp = %d\n", + "%s: size %dx%d (%4.4s) bytesperline = %d, size = %d, bpp = %d\n", __func__, format->fmt.pix.width, format->fmt.pix.height, - print_fourcc(format->fmt.pix.pixelformat), + (char *)&format->fmt.pix.pixelformat, format->fmt.pix.bytesperline, format->fmt.pix.sizeimage, *bpp); return 0; @@ -1446,9 +1432,9 @@ static int __vpfe_set_format(struct vpfe_device *vpfe, format->type = vpfe->v_fmt.type; vpfe_dbg(1, vpfe, - "%s size %dx%d (%s) bytesperline = %d, size = %d, bpp = %d\n", + "%s: size %dx%d (%4.4s) bytesperline = %d, size = %d, bpp = %d\n", __func__, format->fmt.pix.width, format->fmt.pix.height, - print_fourcc(format->fmt.pix.pixelformat), + (char *)&format->fmt.pix.pixelformat, format->fmt.pix.bytesperline, format->fmt.pix.sizeimage, *bpp); return 0; @@ -1486,8 +1472,8 @@ static int vpfe_enum_fmt(struct file *file, void *priv, f->pixelformat = fmt->fourcc; - vpfe_dbg(1, vpfe, "%s: mbus index: %d code: %x pixelformat: %s\n", - __func__, f->index, fmt->code, print_fourcc(fmt->fourcc)); + vpfe_dbg(1, vpfe, "%s: mbus index: %d code: %x pixelformat: %4.4s\n", + __func__, f->index, fmt->code, (char *)&fmt->fourcc); return 0; }
print_fourcc helper function was used for debug log the convert a pixel format code into its readable form for display purposes. But since it used a single static buffer to perform the conversion this might lead to display format issue when more than one instance was invoked simultaneously. It turns out that print_fourcc can be safely replace by using "%4.4s" instead and casting the pointer to the fourcc code into a (char *). Signed-off-by: Benoit Parrot <bparrot@ti.com> --- drivers/media/platform/am437x/am437x-vpfe.c | 34 ++++++--------------- 1 file changed, 10 insertions(+), 24 deletions(-)