Cleanup ipu3 driver
Subsystems (3)
PATCH 1/1 Cleanup ipu3 driver
Clean up warnings generated by ./scripts/checkpatch.pl regarding the ipu3 driver at /drivers/staging/media/ipu3
More specifically, the following files have been affected: ipu3-css.c, ipu3-mmu.c, ipu3-mmu.h, ipu3-v4l2.c, ipu3.c, ipu3.h
--- drivers/staging/media/ipu3/ipu3-css.c | 39 ++++++++++++-------------- drivers/staging/media/ipu3/ipu3-mmu.c | 2 +- drivers/staging/media/ipu3/ipu3-mmu.h | 4 ++- drivers/staging/media/ipu3/ipu3-v4l2.c | 11 ++++---- drivers/staging/media/ipu3/ipu3.c | 7 ++--- 5 files changed, 30 insertions(+), 33 deletions(-)
drivers/staging/media/ipu3/ipu3-css.c +18 -21
@@ -118,7 +118,8 @@ static const struct {/* Initialize queue based on given format, adjust format as needed */ static int imgu_css_queue_init (struct imgu_css_queue *queue, -struct v4l2_pix_format_mplane *fmt,u32 flags) +struct v4l2_pix_format_mplane *fmt, +u32 flags) {struct v4l2_pix_format_mplane *const f = &queue->fmt.mpix;unsigned int i;
@@ -1033,8 +1034,8 @@ static int imgu_css_pipeline_init(struct imgu_css *css, unsigned int pipe)3 * cfg_dvs->num_horizontal_blocks /2 * cfg_dvs->num_vertical_blocks) ||imgu_css_pool_init (imgu, &css_pipe->pool.obgrid, -imgu_css_fw_obgrid_size ( - &css->fwp->binary_header[css_pipe->bindex]))) +imgu_css_fw_obgrid_size + (&css->fwp->binary_header[css_pipe->bindex]))) goto out_of_memory;for (i =0 ; i <IMGU_ABI_NUM_MEMORIES ; i++)
@@ -1225,8 +1226,7 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe)for (j =IMGU_ABI_PARAM_CLASS_CONFIG ; j <IMGU_ABI_PARAM_CLASS_NUM ; j++)for (i =0 ; i <IMGU_ABI_NUM_MEMORIES ; i++) { -if (imgu_css_dma_buffer_resize ( - imgu, +if (imgu_css_dma_buffer_resize (imgu, &css_pipe->binary_params_cs[j -1 ][i], bi->info.isp.sp.mem_initializers.params[j][i].size)) goto out_of_memory;
@@ -1241,6 +1241,7 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe) css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].height =ALIGN (css_pipe->rect[IPU3_CSS_RECT_BDS ].height,IMGU_DVS_BLOCK_H ) +2 *IMGU_GDC_BUF_Y ; + h = css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].height; w =ALIGN (css_pipe->rect[IPU3_CSS_RECT_BDS ].width,2 *IPU3_UAPI_ISP_VEC_ELEMS ) +2 *IMGU_GDC_BUF_X ;
@@ -1248,10 +1249,9 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe) css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].bytesperpixel * w; size = w * h *BYPC + (w /2 ) * (h /2 ) *BYPC *2 ;for (i =0 ; i <IPU3_CSS_AUX_FRAMES ; i++) -if (imgu_css_dma_buffer_resize ( - imgu, - &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].mem[i], - size)) +if (imgu_css_dma_buffer_resize (imgu, + &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].mem[i], + size)) goto out_of_memory;/* TNR frames for temporal noise reduction, FRAME_FORMAT_YUV_LINE */
@@ -1269,10 +1269,9 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe) h = css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_TNR ].height; size = w *ALIGN (h *3 /2 +3 ,2 );/* +3 for vf_pp prefetch */ for (i =0 ; i <IPU3_CSS_AUX_FRAMES ; i++) -if (imgu_css_dma_buffer_resize ( - imgu, - &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_TNR ].mem[i], - size)) +if (imgu_css_dma_buffer_resize (imgu, + &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_TNR ].mem[i], + size)) goto out_of_memory;return 0 ;
@@ -2036,7 +2035,7 @@ struct imgu_css_buffer *imgu_css_buf_dequeue(struct imgu_css *css) struct imgu_css_buffer, list);if (queue != b->queue || daddr != css_pipe->abi_buffers - [b->queue][b->queue_pos].daddr) { + [b->queue][b->queue_pos].daddr) {spin_unlock (&css_pipe->qlock);dev_err (css->dev,"dequeued bad buffer 0x%x\n" , daddr);return ERR_PTR (-EIO );
@@ -2169,7 +2168,7 @@ int imgu_css_set_parameters(struct imgu_css *css, unsigned int pipe, map =imgu_css_pool_last (&css_pipe->pool.acc,1 );/* user acc */ r =imgu_css_cfg_acc (css, pipe, use, acc, map->vaddr, - set_params ? &set_params->acc_param :NULL ); + set_params ? &set_params->acc_param :NULL );if (r <0 ) goto fail; }
@@ -2298,13 +2297,11 @@ int imgu_css_set_parameters(struct imgu_css *css, unsigned int pipe,if (obgrid)imgu_css_pool_put (&css_pipe->pool.obgrid);if (vmem0) -imgu_css_pool_put ( - &css_pipe->pool.binary_params_p - [IMGU_ABI_MEM_ISP_VMEM0 ]); +imgu_css_pool_put (&css_pipe->pool.binary_params_p + [IMGU_ABI_MEM_ISP_VMEM0 ]);if (dmem0) -imgu_css_pool_put ( - &css_pipe->pool.binary_params_p - [IMGU_ABI_MEM_ISP_DMEM0 ]); +imgu_css_pool_put (&css_pipe->pool.binary_params_p + [IMGU_ABI_MEM_ISP_DMEM0 ]); fail_no_put:return r;
drivers/staging/media/ipu3/ipu3-mmu.c +1 -1
@@ -21,7 +21,7 @@#include "ipu3-mmu.h" #define IPU3_PT_BITS 10 -#define IPU3_PT_PTES (1UL << IPU3_PT_BITS) +#define IPU3_PT_PTES (BIT(IPU3_PT_BITS))#define IPU3_PT_SIZE (IPU3_PT_PTES << 2)#define IPU3_PT_ORDER (IPU3_PT_SIZE >> PAGE_SHIFT)
drivers/staging/media/ipu3/ipu3-mmu.h +3 -1
@@ -5,8 +5,10 @@#ifndef __IPU3_MMU_H#define __IPU3_MMU_H +#include <linux/bitops.h> +#define IPU3_PAGE_SHIFT 12 -#define IPU3_PAGE_SIZE (1UL << IPU3_PAGE_SHIFT) +#define IPU3_PAGE_SIZE (BIT(IPU3_PAGE_SHIFT))/** * struct imgu_mmu_info - Describes mmu geometry
drivers/staging/media/ipu3/ipu3-v4l2.c +5 -6
@@ -245,9 +245,9 @@ static int imgu_subdev_set_selection(struct v4l2_subdev *sd,struct v4l2_rect *rect;dev_dbg (&imgu->pci_dev->dev, -"set subdev %u sel which %u target 0x%4x rect [%ux%u]" , - imgu_sd->pipe, sel->which, sel->target, - sel->r.width, sel->r.height); +"set subdev %u sel which %u target 0x%4x rect [%ux%u]" , + imgu_sd->pipe, sel->which, sel->target, + sel->r.width, sel->r.height);if (sel->pad !=IMGU_NODE_IN )return -EINVAL ;
@@ -288,7 +288,7 @@ static int imgu_link_setup(struct media_entity *entity,WARN_ON (pad >=IMGU_NODE_NUM );dev_dbg (&imgu->pci_dev->dev,"pipe %u pad %u is %s" , pipe, pad, -str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED )); +str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED )); imgu_pipe = &imgu->imgu_pipe[pipe]; imgu_pipe->nodes[pad].enabled = flags &MEDIA_LNK_FL_ENABLED ;
@@ -303,7 +303,7 @@ static int imgu_link_setup(struct media_entity *entity,__clear_bit (pipe, imgu->css.enabled_pipes);dev_dbg (&imgu->pci_dev->dev,"pipe %u is %s" , pipe, -str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED )); +str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED ));return 0 ; }
@@ -750,7 +750,6 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node, }else { fmts[i] = &imgu_pipe->nodes[inode].vdev_fmt.fmt.pix_mp; } - }if (!try) {
drivers/staging/media/ipu3/ipu3.c +3 -4
@@ -151,7 +151,7 @@ static int imgu_dummybufs_init(struct imgu_device *imgu, unsigned int pipe)/* May be called from atomic context */ static struct imgu_css_buffer *imgu_dummybufs_get (struct imgu_device *imgu, -int queue,unsigned int pipe) +int queue,unsigned int pipe) {unsigned int i;struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];
@@ -556,8 +556,7 @@ static irqreturn_t imgu_isr_threaded(int irq, void *imgu_ptr) buf->vid_buf.vbb.vb2_buf.timestamp = ns; buf->vid_buf.vbb.field =V4L2_FIELD_NONE ; buf->vid_buf.vbb.sequence = -atomic_inc_return ( - &imgu_pipe->nodes[node].sequence); +atomic_inc_return (&imgu_pipe->nodes[node].sequence);dev_dbg (&imgu->pci_dev->dev,"vb2 buffer sequence %d" , buf->vid_buf.vbb.sequence); }
@@ -774,7 +773,7 @@ static int __maybe_unused imgu_suspend(struct device *dev)synchronize_irq (pci_dev->irq);/* Wait until all buffers in CSS are done. */ if (!wait_event_timeout (imgu->buf_drain_wq, -imgu_css_queue_empty (&imgu->css),msecs_to_jiffies (1000 ))) +imgu_css_queue_empty (&imgu->css),msecs_to_jiffies (1000 )))dev_err (dev,"wait buffer drain timeout.\n" );imgu_css_stop_streaming (&imgu->css);
Signature · 1 line
2.51.0
Greg KH
maintainerQuoted 3 lines · Bogdan Sandu
Clean up warnings generated by
./scripts/checkpatch.plregarding the ipu3 driver at /drivers/staging/media/ipu3More specifically, the following files have been affected:
ipu3-css.c,ipu3-mmu.c,ipu3-mmu.h,ipu3-v4l2.c,ipu3.c,ipu3.h
Was this an AI generated patch?
Either way, it needs to be properly broken up into "one logical change per patch" like all others.
thanks,
greg k-h
Quoted 2 lines
Was this an AI generated patch?
I can assure you, it is not AI-generated.
Quoted 1 line
Either way, it needs to be properly broken up into "one logical change
per patch" like all others.
Understood. I'll resend it afterwards.
Thank you for your patience.
PATCH 1/1 Cleanup ipu3 driver
Clean up warnings generated by ./scripts/checkpatch.pl regarding the ipu3 driver at /drivers/staging/media/ipu3
More specifically, the following files have been affected: ipu3-css.c, ipu3-mmu.c, ipu3-mmu.h, ipu3-v4l2.c, ipu3.c, ipu3.h
--- drivers/staging/media/ipu3/ipu3-css.c | 39 ++++++++++++-------------- drivers/staging/media/ipu3/ipu3-mmu.c | 2 +- drivers/staging/media/ipu3/ipu3-mmu.h | 4 ++- drivers/staging/media/ipu3/ipu3-v4l2.c | 11 ++++---- drivers/staging/media/ipu3/ipu3.c | 7 ++--- 5 files changed, 30 insertions(+), 33 deletions(-)
drivers/staging/media/ipu3/ipu3-css.c +18 -21
@@ -118,7 +118,8 @@ static const struct {/* Initialize queue based on given format, adjust format as needed */ static int imgu_css_queue_init (struct imgu_css_queue *queue, -struct v4l2_pix_format_mplane *fmt,u32 flags) +struct v4l2_pix_format_mplane *fmt, +u32 flags) {struct v4l2_pix_format_mplane *const f = &queue->fmt.mpix;unsigned int i;
@@ -1033,8 +1034,8 @@ static int imgu_css_pipeline_init(struct imgu_css *css, unsigned int pipe)3 * cfg_dvs->num_horizontal_blocks /2 * cfg_dvs->num_vertical_blocks) ||imgu_css_pool_init (imgu, &css_pipe->pool.obgrid, -imgu_css_fw_obgrid_size ( - &css->fwp->binary_header[css_pipe->bindex]))) +imgu_css_fw_obgrid_size + (&css->fwp->binary_header[css_pipe->bindex]))) goto out_of_memory;for (i =0 ; i <IMGU_ABI_NUM_MEMORIES ; i++)
@@ -1225,8 +1226,7 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe)for (j =IMGU_ABI_PARAM_CLASS_CONFIG ; j <IMGU_ABI_PARAM_CLASS_NUM ; j++)for (i =0 ; i <IMGU_ABI_NUM_MEMORIES ; i++) { -if (imgu_css_dma_buffer_resize ( - imgu, +if (imgu_css_dma_buffer_resize (imgu, &css_pipe->binary_params_cs[j -1 ][i], bi->info.isp.sp.mem_initializers.params[j][i].size)) goto out_of_memory;
@@ -1241,6 +1241,7 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe) css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].height =ALIGN (css_pipe->rect[IPU3_CSS_RECT_BDS ].height,IMGU_DVS_BLOCK_H ) +2 *IMGU_GDC_BUF_Y ; + h = css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].height; w =ALIGN (css_pipe->rect[IPU3_CSS_RECT_BDS ].width,2 *IPU3_UAPI_ISP_VEC_ELEMS ) +2 *IMGU_GDC_BUF_X ;
@@ -1248,10 +1249,9 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe) css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].bytesperpixel * w; size = w * h *BYPC + (w /2 ) * (h /2 ) *BYPC *2 ;for (i =0 ; i <IPU3_CSS_AUX_FRAMES ; i++) -if (imgu_css_dma_buffer_resize ( - imgu, - &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].mem[i], - size)) +if (imgu_css_dma_buffer_resize (imgu, + &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].mem[i], + size)) goto out_of_memory;/* TNR frames for temporal noise reduction, FRAME_FORMAT_YUV_LINE */
@@ -1269,10 +1269,9 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe) h = css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_TNR ].height; size = w *ALIGN (h *3 /2 +3 ,2 );/* +3 for vf_pp prefetch */ for (i =0 ; i <IPU3_CSS_AUX_FRAMES ; i++) -if (imgu_css_dma_buffer_resize ( - imgu, - &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_TNR ].mem[i], - size)) +if (imgu_css_dma_buffer_resize (imgu, + &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_TNR ].mem[i], + size)) goto out_of_memory;return 0 ;
@@ -2036,7 +2035,7 @@ struct imgu_css_buffer *imgu_css_buf_dequeue(struct imgu_css *css) struct imgu_css_buffer, list);if (queue != b->queue || daddr != css_pipe->abi_buffers - [b->queue][b->queue_pos].daddr) { + [b->queue][b->queue_pos].daddr) {spin_unlock (&css_pipe->qlock);dev_err (css->dev,"dequeued bad buffer 0x%x\n" , daddr);return ERR_PTR (-EIO );
@@ -2169,7 +2168,7 @@ int imgu_css_set_parameters(struct imgu_css *css, unsigned int pipe, map =imgu_css_pool_last (&css_pipe->pool.acc,1 );/* user acc */ r =imgu_css_cfg_acc (css, pipe, use, acc, map->vaddr, - set_params ? &set_params->acc_param :NULL ); + set_params ? &set_params->acc_param :NULL );if (r <0 ) goto fail; }
@@ -2298,13 +2297,11 @@ int imgu_css_set_parameters(struct imgu_css *css, unsigned int pipe,if (obgrid)imgu_css_pool_put (&css_pipe->pool.obgrid);if (vmem0) -imgu_css_pool_put ( - &css_pipe->pool.binary_params_p - [IMGU_ABI_MEM_ISP_VMEM0 ]); +imgu_css_pool_put (&css_pipe->pool.binary_params_p + [IMGU_ABI_MEM_ISP_VMEM0 ]);if (dmem0) -imgu_css_pool_put ( - &css_pipe->pool.binary_params_p - [IMGU_ABI_MEM_ISP_DMEM0 ]); +imgu_css_pool_put (&css_pipe->pool.binary_params_p + [IMGU_ABI_MEM_ISP_DMEM0 ]); fail_no_put:return r;
drivers/staging/media/ipu3/ipu3-mmu.c +1 -1
@@ -21,7 +21,7 @@#include "ipu3-mmu.h" #define IPU3_PT_BITS 10 -#define IPU3_PT_PTES (1UL << IPU3_PT_BITS) +#define IPU3_PT_PTES (BIT(IPU3_PT_BITS))#define IPU3_PT_SIZE (IPU3_PT_PTES << 2)#define IPU3_PT_ORDER (IPU3_PT_SIZE >> PAGE_SHIFT)
drivers/staging/media/ipu3/ipu3-mmu.h +3 -1
@@ -5,8 +5,10 @@#ifndef __IPU3_MMU_H#define __IPU3_MMU_H +#include <linux/bitops.h> +#define IPU3_PAGE_SHIFT 12 -#define IPU3_PAGE_SIZE (1UL << IPU3_PAGE_SHIFT) +#define IPU3_PAGE_SIZE (BIT(IPU3_PAGE_SHIFT))/** * struct imgu_mmu_info - Describes mmu geometry
drivers/staging/media/ipu3/ipu3-v4l2.c +5 -6
@@ -245,9 +245,9 @@ static int imgu_subdev_set_selection(struct v4l2_subdev *sd,struct v4l2_rect *rect;dev_dbg (&imgu->pci_dev->dev, -"set subdev %u sel which %u target 0x%4x rect [%ux%u]" , - imgu_sd->pipe, sel->which, sel->target, - sel->r.width, sel->r.height); +"set subdev %u sel which %u target 0x%4x rect [%ux%u]" , + imgu_sd->pipe, sel->which, sel->target, + sel->r.width, sel->r.height);if (sel->pad !=IMGU_NODE_IN )return -EINVAL ;
@@ -288,7 +288,7 @@ static int imgu_link_setup(struct media_entity *entity,WARN_ON (pad >=IMGU_NODE_NUM );dev_dbg (&imgu->pci_dev->dev,"pipe %u pad %u is %s" , pipe, pad, -str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED )); +str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED )); imgu_pipe = &imgu->imgu_pipe[pipe]; imgu_pipe->nodes[pad].enabled = flags &MEDIA_LNK_FL_ENABLED ;
@@ -303,7 +303,7 @@ static int imgu_link_setup(struct media_entity *entity,__clear_bit (pipe, imgu->css.enabled_pipes);dev_dbg (&imgu->pci_dev->dev,"pipe %u is %s" , pipe, -str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED )); +str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED ));return 0 ; }
@@ -750,7 +750,6 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node, }else { fmts[i] = &imgu_pipe->nodes[inode].vdev_fmt.fmt.pix_mp; } - }if (!try) {
drivers/staging/media/ipu3/ipu3.c +3 -4
@@ -151,7 +151,7 @@ static int imgu_dummybufs_init(struct imgu_device *imgu, unsigned int pipe)/* May be called from atomic context */ static struct imgu_css_buffer *imgu_dummybufs_get (struct imgu_device *imgu, -int queue,unsigned int pipe) +int queue,unsigned int pipe) {unsigned int i;struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];
@@ -556,8 +556,7 @@ static irqreturn_t imgu_isr_threaded(int irq, void *imgu_ptr) buf->vid_buf.vbb.vb2_buf.timestamp = ns; buf->vid_buf.vbb.field =V4L2_FIELD_NONE ; buf->vid_buf.vbb.sequence = -atomic_inc_return ( - &imgu_pipe->nodes[node].sequence); +atomic_inc_return (&imgu_pipe->nodes[node].sequence);dev_dbg (&imgu->pci_dev->dev,"vb2 buffer sequence %d" , buf->vid_buf.vbb.sequence); }
@@ -774,7 +773,7 @@ static int __maybe_unused imgu_suspend(struct device *dev)synchronize_irq (pci_dev->irq);/* Wait until all buffers in CSS are done. */ if (!wait_event_timeout (imgu->buf_drain_wq, -imgu_css_queue_empty (&imgu->css),msecs_to_jiffies (1000 ))) +imgu_css_queue_empty (&imgu->css),msecs_to_jiffies (1000 )))dev_err (dev,"wait buffer drain timeout.\n" );imgu_css_stop_streaming (&imgu->css);
Signature · 1 line
2.51.0
Greg KH
maintainerQuoted 4 lines · Bogdan Sandu
Clean up warnings generated by
./scripts/checkpatch.plregarding the ipu3 driver at /drivers/staging/media/ipu3More specifically, the following files have been affected:
ipu3-css.c,ipu3-mmu.c,ipu3-mmu.h,ipu3-v4l2.c,ipu3.c,ipu3.h
Quoted 8 lines
Signed-off-by Bogdan Sandu <[email protected]>--- drivers/staging/media/ipu3/ipu3-css.c | 39 ++++++++++++-------------- drivers/staging/media/ipu3/ipu3-mmu.c | 2 +- drivers/staging/media/ipu3/ipu3-mmu.h | 4 ++- drivers/staging/media/ipu3/ipu3-v4l2.c | 11 ++++---- drivers/staging/media/ipu3/ipu3.c | 7 ++--- 5 files changed, 30 insertions(+), 33 deletions(-)
You resent the same thing again?
confused,
greg k-h
Apologies, it is my first time using mail lists.
v2 cover Cleanup media:ipu3 driver
In reply to Greg KHThe previous patch has now been separated into four smaller ones, each one fixing a specific type of checkpatch.pl issue.
Bogdan Sandu (4):
media: ipu3: fix alignment
media: ipu3: use tabs
media: ipu3: avoid ending lines with paranthesis
media: ipu3: use BIT()
drivers/staging/media/ipu3/ipu3-css.c | 39 ++++++++++++-------------- drivers/staging/media/ipu3/ipu3-mmu.c | 2 +- drivers/staging/media/ipu3/ipu3-mmu.h | 4 ++- drivers/staging/media/ipu3/ipu3-v4l2.c | 11 ++++---- drivers/staging/media/ipu3/ipu3.c | 7 ++--- 5 files changed, 30 insertions(+), 33 deletions(-)
Signature · 1 line
2.51.0
PATCH v2 1/4 media: ipu3: fix alignment
Fix alignment with parentheses.
--- drivers/staging/media/ipu3/ipu3-css.c | 22 +++++++++++----------- drivers/staging/media/ipu3/ipu3-v4l2.c | 11 +++++------ drivers/staging/media/ipu3/ipu3.c | 4 ++-- 3 files changed, 18 insertions(+), 19 deletions(-)
drivers/staging/media/ipu3/ipu3-css.c +11 -11
@@ -118,7 +118,8 @@ static const struct {/* Initialize queue based on given format, adjust format as needed */ static int imgu_css_queue_init (struct imgu_css_queue *queue, -struct v4l2_pix_format_mplane *fmt,u32 flags) +struct v4l2_pix_format_mplane *fmt, +u32 flags) {struct v4l2_pix_format_mplane *const f = &queue->fmt.mpix;unsigned int i;
@@ -1241,6 +1242,7 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe) css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].height =ALIGN (css_pipe->rect[IPU3_CSS_RECT_BDS ].height,IMGU_DVS_BLOCK_H ) +2 *IMGU_GDC_BUF_Y ; + h = css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].height; w =ALIGN (css_pipe->rect[IPU3_CSS_RECT_BDS ].width,2 *IPU3_UAPI_ISP_VEC_ELEMS ) +2 *IMGU_GDC_BUF_X ;
@@ -1248,10 +1250,9 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe) css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].bytesperpixel * w; size = w * h *BYPC + (w /2 ) * (h /2 ) *BYPC *2 ;for (i =0 ; i <IPU3_CSS_AUX_FRAMES ; i++) -if (imgu_css_dma_buffer_resize ( - imgu, - &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].mem[i], - size)) +if (imgu_css_dma_buffer_resize (imgu, + &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].mem[i], + size)) goto out_of_memory;/* TNR frames for temporal noise reduction, FRAME_FORMAT_YUV_LINE */
@@ -1269,10 +1270,9 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe) h = css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_TNR ].height; size = w *ALIGN (h *3 /2 +3 ,2 );/* +3 for vf_pp prefetch */ for (i =0 ; i <IPU3_CSS_AUX_FRAMES ; i++) -if (imgu_css_dma_buffer_resize ( - imgu, - &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_TNR ].mem[i], - size)) +if (imgu_css_dma_buffer_resize (imgu, + &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_TNR ].mem[i], + size)) goto out_of_memory;return 0 ;
@@ -2036,7 +2036,7 @@ struct imgu_css_buffer *imgu_css_buf_dequeue(struct imgu_css *css) struct imgu_css_buffer, list);if (queue != b->queue || daddr != css_pipe->abi_buffers - [b->queue][b->queue_pos].daddr) { + [b->queue][b->queue_pos].daddr) {spin_unlock (&css_pipe->qlock);dev_err (css->dev,"dequeued bad buffer 0x%x\n" , daddr);return ERR_PTR (-EIO );
@@ -2169,7 +2169,7 @@ int imgu_css_set_parameters(struct imgu_css *css, unsigned int pipe, map =imgu_css_pool_last (&css_pipe->pool.acc,1 );/* user acc */ r =imgu_css_cfg_acc (css, pipe, use, acc, map->vaddr, - set_params ? &set_params->acc_param :NULL ); + set_params ? &set_params->acc_param :NULL );if (r <0 ) goto fail; }
drivers/staging/media/ipu3/ipu3-v4l2.c +5 -6
@@ -245,9 +245,9 @@ static int imgu_subdev_set_selection(struct v4l2_subdev *sd,struct v4l2_rect *rect;dev_dbg (&imgu->pci_dev->dev, -"set subdev %u sel which %u target 0x%4x rect [%ux%u]" , - imgu_sd->pipe, sel->which, sel->target, - sel->r.width, sel->r.height); +"set subdev %u sel which %u target 0x%4x rect [%ux%u]" , + imgu_sd->pipe, sel->which, sel->target, + sel->r.width, sel->r.height);if (sel->pad !=IMGU_NODE_IN )return -EINVAL ;
@@ -288,7 +288,7 @@ static int imgu_link_setup(struct media_entity *entity,WARN_ON (pad >=IMGU_NODE_NUM );dev_dbg (&imgu->pci_dev->dev,"pipe %u pad %u is %s" , pipe, pad, -str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED )); +str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED )); imgu_pipe = &imgu->imgu_pipe[pipe]; imgu_pipe->nodes[pad].enabled = flags &MEDIA_LNK_FL_ENABLED ;
@@ -303,7 +303,7 @@ static int imgu_link_setup(struct media_entity *entity,__clear_bit (pipe, imgu->css.enabled_pipes);dev_dbg (&imgu->pci_dev->dev,"pipe %u is %s" , pipe, -str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED )); +str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED ));return 0 ; }
@@ -750,7 +750,6 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node, }else { fmts[i] = &imgu_pipe->nodes[inode].vdev_fmt.fmt.pix_mp; } - }if (!try) {
drivers/staging/media/ipu3/ipu3.c +2 -2
@@ -151,7 +151,7 @@ static int imgu_dummybufs_init(struct imgu_device *imgu, unsigned int pipe)/* May be called from atomic context */ static struct imgu_css_buffer *imgu_dummybufs_get (struct imgu_device *imgu, -int queue,unsigned int pipe) +int queue,unsigned int pipe) {unsigned int i;struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];
@@ -774,7 +774,7 @@ static int __maybe_unused imgu_suspend(struct device *dev)synchronize_irq (pci_dev->irq);/* Wait until all buffers in CSS are done. */ if (!wait_event_timeout (imgu->buf_drain_wq, -imgu_css_queue_empty (&imgu->css),msecs_to_jiffies (1000 ))) +imgu_css_queue_empty (&imgu->css),msecs_to_jiffies (1000 )))dev_err (dev,"wait buffer drain timeout.\n" );imgu_css_stop_streaming (&imgu->css);
Signature · 1 line
2.51.0
Sakari Ailus
maintainerRe: [PATCH v2 1/4] media: ipu3: fix alignment
Hi Bogdan,
Quoted 14 lines · Bogdan Sandu
Fix alignment with parentheses.
Signed-off-by Bogdan Sandu <[email protected]>--- drivers/staging/media/ipu3/ipu3-css.c | 22 +++++++++++----------- drivers/staging/media/ipu3/ipu3-v4l2.c | 11 +++++------ drivers/staging/media/ipu3/ipu3.c | 4 ++-- 3 files changed, 18 insertions(+), 19 deletions(-)drivers/staging/media/ipu3/ipu3-css.c +0
-0
drivers/staging/media/ipu3/ipu3-css.c static const struct { · line 122
Quoted 6 lines
drivers/staging/media/ipu3/ipu3-css.c +2
-1@@ -118,7 +118,8 @@ static const struct {/* Initialize queue based on given format, adjust format as needed */ static int imgu_css_queue_init (struct imgu_css_queue *queue, -struct v4l2_pix_format_mplane *fmt,u32 flags) +struct v4l2_pix_format_mplane *fmt, +u32 flags)
Why?
Quoted 122 lines
drivers/staging/media/ipu3/ipu3-css.c +9
-10{struct v4l2_pix_format_mplane *const f = &queue->fmt.mpix;unsigned int i;@@ -1241,6 +1242,7 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe) css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].height =ALIGN (css_pipe->rect[IPU3_CSS_RECT_BDS ].height,IMGU_DVS_BLOCK_H ) +2 *IMGU_GDC_BUF_Y ; + h = css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].height; w =ALIGN (css_pipe->rect[IPU3_CSS_RECT_BDS ].width,2 *IPU3_UAPI_ISP_VEC_ELEMS ) +2 *IMGU_GDC_BUF_X ;@@ -1248,10 +1250,9 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe) css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].bytesperpixel * w; size = w * h *BYPC + (w /2 ) * (h /2 ) *BYPC *2 ;for (i =0 ; i <IPU3_CSS_AUX_FRAMES ; i++) -if (imgu_css_dma_buffer_resize ( - imgu, - &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].mem[i], - size)) +if (imgu_css_dma_buffer_resize (imgu, + &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_REF ].mem[i], + size)) goto out_of_memory;/* TNR frames for temporal noise reduction, FRAME_FORMAT_YUV_LINE */ @@ -1269,10 +1270,9 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe) h = css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_TNR ].height; size = w *ALIGN (h *3 /2 +3 ,2 );/* +3 for vf_pp prefetch */ for (i =0 ; i <IPU3_CSS_AUX_FRAMES ; i++) -if (imgu_css_dma_buffer_resize ( - imgu, - &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_TNR ].mem[i], - size)) +if (imgu_css_dma_buffer_resize (imgu, + &css_pipe->aux_frames[IPU3_CSS_AUX_FRAME_TNR ].mem[i], + size)) goto out_of_memory;return 0 ;@@ -2036,7 +2036,7 @@ struct imgu_css_buffer *imgu_css_buf_dequeue(struct imgu_css *css) struct imgu_css_buffer, list);if (queue != b->queue || daddr != css_pipe->abi_buffers - [b->queue][b->queue_pos].daddr) { + [b->queue][b->queue_pos].daddr) {spin_unlock (&css_pipe->qlock);dev_err (css->dev,"dequeued bad buffer 0x%x\n" , daddr);return ERR_PTR (-EIO );@@ -2169,7 +2169,7 @@ int imgu_css_set_parameters(struct imgu_css *css, unsigned int pipe, map =imgu_css_pool_last (&css_pipe->pool.acc,1 );/* user acc */ r =imgu_css_cfg_acc (css, pipe, use, acc, map->vaddr, - set_params ? &set_params->acc_param :NULL ); + set_params ? &set_params->acc_param :NULL );if (r <0 ) goto fail; }drivers/staging/media/ipu3/ipu3-v4l2.c +5
-6@@ -245,9 +245,9 @@ static int imgu_subdev_set_selection(struct v4l2_subdev *sd,struct v4l2_rect *rect;dev_dbg (&imgu->pci_dev->dev, -"set subdev %u sel which %u target 0x%4x rect [%ux%u]" , - imgu_sd->pipe, sel->which, sel->target, - sel->r.width, sel->r.height); +"set subdev %u sel which %u target 0x%4x rect [%ux%u]" , + imgu_sd->pipe, sel->which, sel->target, + sel->r.width, sel->r.height);if (sel->pad !=IMGU_NODE_IN )return -EINVAL ;@@ -288,7 +288,7 @@ static int imgu_link_setup(struct media_entity *entity,WARN_ON (pad >=IMGU_NODE_NUM );dev_dbg (&imgu->pci_dev->dev,"pipe %u pad %u is %s" , pipe, pad, -str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED )); +str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED )); imgu_pipe = &imgu->imgu_pipe[pipe]; imgu_pipe->nodes[pad].enabled = flags &MEDIA_LNK_FL_ENABLED ;@@ -303,7 +303,7 @@ static int imgu_link_setup(struct media_entity *entity,__clear_bit (pipe, imgu->css.enabled_pipes);dev_dbg (&imgu->pci_dev->dev,"pipe %u is %s" , pipe, -str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED )); +str_enabled_disabled (flags &MEDIA_LNK_FL_ENABLED ));return 0 ; }@@ -750,7 +750,6 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node, }else { fmts[i] = &imgu_pipe->nodes[inode].vdev_fmt.fmt.pix_mp; } - }if (!try) {drivers/staging/media/ipu3/ipu3.c +2
-2@@ -151,7 +151,7 @@ static int imgu_dummybufs_init(struct imgu_device *imgu, unsigned int pipe)/* May be called from atomic context */ static struct imgu_css_buffer *imgu_dummybufs_get (struct imgu_device *imgu, -int queue,unsigned int pipe) +int queue,unsigned int pipe) {unsigned int i;struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];@@ -774,7 +774,7 @@ static int __maybe_unused imgu_suspend(struct device *dev)synchronize_irq (pci_dev->irq);/* Wait until all buffers in CSS are done. */ if (!wait_event_timeout (imgu->buf_drain_wq, -imgu_css_queue_empty (&imgu->css),msecs_to_jiffies (1000 ))) +imgu_css_queue_empty (&imgu->css),msecs_to_jiffies (1000 )))dev_err (dev,"wait buffer drain timeout.\n" );imgu_css_stop_streaming (&imgu->css);
Signature · 3 lines
Regards, Sakari Ailus
Re: [PATCH v2 1/4] media: ipu3: fix alignment
Hello Sakari,
The quoted change was made in error.
If you'd like me to resend the patch, please let me know. Otherwise I will refrain from resending it to avoid creating noise.
--
Regards,
Bogdan Sandu
PATCH v2 2/4 media: ipu3: use tabs
In reply to Bogdan SanduUse tabs instead of spaces.
--- drivers/staging/media/ipu3/ipu3-css.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/media/ipu3/ipu3-css.c +2 -2
@@ -1034,8 +1034,8 @@ static int imgu_css_pipeline_init(struct imgu_css *css, unsigned int pipe)3 * cfg_dvs->num_horizontal_blocks /2 * cfg_dvs->num_vertical_blocks) ||imgu_css_pool_init (imgu, &css_pipe->pool.obgrid, -imgu_css_fw_obgrid_size ( - &css->fwp->binary_header[css_pipe->bindex]))) +imgu_css_fw_obgrid_size + (&css->fwp->binary_header[css_pipe->bindex]))) goto out_of_memory;for (i =0 ; i <IMGU_ABI_NUM_MEMORIES ; i++)
Signature · 1 line
2.51.0
Sakari Ailus
maintainerRe: [PATCH v2 2/4] media: ipu3: use tabs
Quoted 12 lines · Bogdan Sandu
Use tabs instead of spaces.
Signed-off-by Bogdan Sandu <[email protected]>--- drivers/staging/media/ipu3/ipu3-css.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/staging/media/ipu3/ipu3-css.c +0
-0
drivers/staging/media/ipu3/ipu3-css.c static int imgu_css_pipeline_init(struct imgu_css *css, unsigned int pipe) · line 1038
Quoted 7 lines
drivers/staging/media/ipu3/ipu3-css.c +2
-2@@ -1034,8 +1034,8 @@ static int imgu_css_pipeline_init(struct imgu_css *css, unsigned int pipe)3 * cfg_dvs->num_horizontal_blocks /2 * cfg_dvs->num_vertical_blocks) ||imgu_css_pool_init (imgu, &css_pipe->pool.obgrid, -imgu_css_fw_obgrid_size ( - &css->fwp->binary_header[css_pipe->bindex]))) +imgu_css_fw_obgrid_size + (&css->fwp->binary_header[css_pipe->bindex])))
This doesn't seem to be a major improvement.
Quoted 3 lines
drivers/staging/media/ipu3/ipu3-css.c +0
-0goto out_of_memory;for (i =0 ; i <IMGU_ABI_NUM_MEMORIES ; i++)
Signature · 1 line
Sakari Ailus
PATCH v2 3/4 media: ipu3: avoid ending lines with paranthesis
In reply to Bogdan SanduDon't end line with paranthesis.
--- drivers/staging/media/ipu3/ipu3-css.c | 13 +++++-------- drivers/staging/media/ipu3/ipu3.c | 3 +-- 2 files changed, 6 insertions(+), 10 deletions(-)
drivers/staging/media/ipu3/ipu3-css.c +5 -8
@@ -1226,8 +1226,7 @@ static int imgu_css_binary_setup(struct imgu_css *css, unsigned int pipe)for (j =IMGU_ABI_PARAM_CLASS_CONFIG ; j <IMGU_ABI_PARAM_CLASS_NUM ; j++)for (i =0 ; i <IMGU_ABI_NUM_MEMORIES ; i++) { -if (imgu_css_dma_buffer_resize ( - imgu, +if (imgu_css_dma_buffer_resize (imgu, &css_pipe->binary_params_cs[j -1 ][i], bi->info.isp.sp.mem_initializers.params[j][i].size)) goto out_of_memory;
@@ -2298,13 +2297,11 @@ int imgu_css_set_parameters(struct imgu_css *css, unsigned int pipe,if (obgrid)imgu_css_pool_put (&css_pipe->pool.obgrid);if (vmem0) -imgu_css_pool_put ( - &css_pipe->pool.binary_params_p - [IMGU_ABI_MEM_ISP_VMEM0 ]); +imgu_css_pool_put (&css_pipe->pool.binary_params_p + [IMGU_ABI_MEM_ISP_VMEM0 ]);if (dmem0) -imgu_css_pool_put ( - &css_pipe->pool.binary_params_p - [IMGU_ABI_MEM_ISP_DMEM0 ]); +imgu_css_pool_put (&css_pipe->pool.binary_params_p + [IMGU_ABI_MEM_ISP_DMEM0 ]); fail_no_put:return r;
drivers/staging/media/ipu3/ipu3.c +1 -2
@@ -556,8 +556,7 @@ static irqreturn_t imgu_isr_threaded(int irq, void *imgu_ptr) buf->vid_buf.vbb.vb2_buf.timestamp = ns; buf->vid_buf.vbb.field =V4L2_FIELD_NONE ; buf->vid_buf.vbb.sequence = -atomic_inc_return ( - &imgu_pipe->nodes[node].sequence); +atomic_inc_return (&imgu_pipe->nodes[node].sequence);dev_dbg (&imgu->pci_dev->dev,"vb2 buffer sequence %d" , buf->vid_buf.vbb.sequence); }
Signature · 1 line
2.51.0
PATCH v2 4/4 media: ipu3: use BIT()
In reply to Bogdan SanduPrefer BIT() macro over manual bitshift.
--- drivers/staging/media/ipu3/ipu3-mmu.c | 2 +- drivers/staging/media/ipu3/ipu3-mmu.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/staging/media/ipu3/ipu3-mmu.c +1 -1
@@ -21,7 +21,7 @@#include "ipu3-mmu.h" #define IPU3_PT_BITS 10 -#define IPU3_PT_PTES (1UL << IPU3_PT_BITS) +#define IPU3_PT_PTES (BIT(IPU3_PT_BITS))#define IPU3_PT_SIZE (IPU3_PT_PTES << 2)#define IPU3_PT_ORDER (IPU3_PT_SIZE >> PAGE_SHIFT)
drivers/staging/media/ipu3/ipu3-mmu.h +3 -1
@@ -5,8 +5,10 @@#ifndef __IPU3_MMU_H#define __IPU3_MMU_H +#include <linux/bitops.h> +#define IPU3_PAGE_SHIFT 12 -#define IPU3_PAGE_SIZE (1UL << IPU3_PAGE_SHIFT) +#define IPU3_PAGE_SIZE (BIT(IPU3_PAGE_SHIFT))/** * struct imgu_mmu_info - Describes mmu geometry
Signature · 1 line
2.51.0
Re: [PATCH v2 4/4] media: ipu3: use BIT()
Quoted 13 lines · Bogdan Sandu
Prefer
BIT()macro over manual bitshift.Signed-off-by Bogdan Sandu <[email protected]>--- drivers/staging/media/ipu3/ipu3-mmu.c | 2 +- drivers/staging/media/ipu3/ipu3-mmu.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)drivers/staging/media/ipu3/ipu3-mmu.c +0
-0
drivers/staging/media/ipu3/ipu3-mmu.c line 24
Quoted 5 lines
drivers/staging/media/ipu3/ipu3-mmu.c +1
-1@@ -21,7 +21,7 @@#include "ipu3-mmu.h" #define IPU3_PT_BITS 10 -#define IPU3_PT_PTES (1UL << IPU3_PT_BITS) +#define IPU3_PT_PTES (BIT(IPU3_PT_BITS))
IPU3_PT_PTES isn't a bit, it's the number of PTEs. It's just shifting because it's a power of two and that's how you calculate power of two.
Quoted 8 lines
drivers/staging/media/ipu3/ipu3-mmu.c +0
-0#define IPU3_PT_SIZE (IPU3_PT_PTES << 2)#define IPU3_PT_ORDER (IPU3_PT_SIZE >> PAGE_SHIFT)drivers/staging/media/ipu3/ipu3-mmu.h +0
-0
drivers/staging/media/ipu3/ipu3-mmu.h line 11
Quoted 8 lines
drivers/staging/media/ipu3/ipu3-mmu.h +3
-1@@ -5,8 +5,10 @@#ifndef __IPU3_MMU_H#define __IPU3_MMU_H +#include <linux/bitops.h> +#define IPU3_PAGE_SHIFT 12 -#define IPU3_PAGE_SIZE (1UL << IPU3_PAGE_SHIFT) +#define IPU3_PAGE_SIZE (BIT(IPU3_PAGE_SHIFT))
Same. This is a size, not a bit.
regards,
dan carpenter