android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: platform: ti: avoid using 'videobuf' or 'video-buf'

Browse Source 
These terms typically refer to the old version 1 videobuf framework.
It is confusing to use them for the vb2 framework, so reword these
comments.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Lad Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans Verkuil 2022-08-10 15:01:25 +02:00 committed by Mauro Carvalho Chehab
parent a13f509b19
commit 6be954808a
8 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/ti/am437x/am437x-vpfe.h
View File

@ -267,7 +267,7 @@ struct vpfe_device {
* is different from the image window * is different from the image window
*/ */
struct v4l2_rect crop; struct v4l2_rect crop;
/* Buffer queue used in video-buf */ /* Buffer queue used in vb2 */
struct vb2_queue buffer_queue; struct vb2_queue buffer_queue;
/* Queue of filled frames */ /* Queue of filled frames */
struct list_head dma_queue; struct list_head dma_queue;

60
drivers/media/platform/ti/davinci/vpif.h
View File

@ -322,10 +322,10 @@ static inline void channel1_intr_enable(int enable)
} }
/* inline function to set buffer addresses in case of Y/C non mux mode */ /* inline function to set buffer addresses in case of Y/C non mux mode */
static inline void ch0_set_videobuf_addr_yc_nmux(unsigned long top_strt_luma, static inline void ch0_set_video_buf_addr_yc_nmux(unsigned long top_strt_luma,
unsigned long btm_strt_luma, unsigned long btm_strt_luma,
unsigned long top_strt_chroma, unsigned long top_strt_chroma,
unsigned long btm_strt_chroma) unsigned long btm_strt_chroma)
{ {
regw(top_strt_luma, VPIF_CH0_TOP_STRT_ADD_LUMA); regw(top_strt_luma, VPIF_CH0_TOP_STRT_ADD_LUMA);
regw(btm_strt_luma, VPIF_CH0_BTM_STRT_ADD_LUMA); regw(btm_strt_luma, VPIF_CH0_BTM_STRT_ADD_LUMA);
@ -334,10 +334,10 @@ static inline void ch0_set_videobuf_addr_yc_nmux(unsigned long top_strt_luma,
} }
/* inline function to set buffer addresses in VPIF registers for video data */ /* inline function to set buffer addresses in VPIF registers for video data */
static inline void ch0_set_videobuf_addr(unsigned long top_strt_luma, static inline void ch0_set_video_buf_addr(unsigned long top_strt_luma,
unsigned long btm_strt_luma, unsigned long btm_strt_luma,
unsigned long top_strt_chroma, unsigned long top_strt_chroma,
unsigned long btm_strt_chroma) unsigned long btm_strt_chroma)
{ {
regw(top_strt_luma, VPIF_CH0_TOP_STRT_ADD_LUMA); regw(top_strt_luma, VPIF_CH0_TOP_STRT_ADD_LUMA);
regw(btm_strt_luma, VPIF_CH0_BTM_STRT_ADD_LUMA); regw(btm_strt_luma, VPIF_CH0_BTM_STRT_ADD_LUMA);
@ -345,10 +345,10 @@ static inline void ch0_set_videobuf_addr(unsigned long top_strt_luma,
regw(btm_strt_chroma, VPIF_CH0_BTM_STRT_ADD_CHROMA); regw(btm_strt_chroma, VPIF_CH0_BTM_STRT_ADD_CHROMA);
} }
static inline void ch1_set_videobuf_addr(unsigned long top_strt_luma, static inline void ch1_set_video_buf_addr(unsigned long top_strt_luma,
unsigned long btm_strt_luma, unsigned long btm_strt_luma,
unsigned long top_strt_chroma, unsigned long top_strt_chroma,
unsigned long btm_strt_chroma) unsigned long btm_strt_chroma)
{ {
regw(top_strt_luma, VPIF_CH1_TOP_STRT_ADD_LUMA); regw(top_strt_luma, VPIF_CH1_TOP_STRT_ADD_LUMA);
@ -538,10 +538,10 @@ static inline void channel3_clipping_enable(int enable)
} }
/* inline function to set buffer addresses in case of Y/C non mux mode */ /* inline function to set buffer addresses in case of Y/C non mux mode */
static inline void ch2_set_videobuf_addr_yc_nmux(unsigned long top_strt_luma, static inline void ch2_set_video_buf_addr_yc_nmux(unsigned long top_strt_luma,
unsigned long btm_strt_luma, unsigned long btm_strt_luma,
unsigned long top_strt_chroma, unsigned long top_strt_chroma,
unsigned long btm_strt_chroma) unsigned long btm_strt_chroma)
{ {
regw(top_strt_luma, VPIF_CH2_TOP_STRT_ADD_LUMA); regw(top_strt_luma, VPIF_CH2_TOP_STRT_ADD_LUMA);
regw(btm_strt_luma, VPIF_CH2_BTM_STRT_ADD_LUMA); regw(btm_strt_luma, VPIF_CH2_BTM_STRT_ADD_LUMA);
@ -550,10 +550,10 @@ static inline void ch2_set_videobuf_addr_yc_nmux(unsigned long top_strt_luma,
} }
/* inline function to set buffer addresses in VPIF registers for video data */ /* inline function to set buffer addresses in VPIF registers for video data */
static inline void ch2_set_videobuf_addr(unsigned long top_strt_luma, static inline void ch2_set_video_buf_addr(unsigned long top_strt_luma,
unsigned long btm_strt_luma, unsigned long btm_strt_luma,
unsigned long top_strt_chroma, unsigned long top_strt_chroma,
unsigned long btm_strt_chroma) unsigned long btm_strt_chroma)
{ {
regw(top_strt_luma, VPIF_CH2_TOP_STRT_ADD_LUMA); regw(top_strt_luma, VPIF_CH2_TOP_STRT_ADD_LUMA);
regw(btm_strt_luma, VPIF_CH2_BTM_STRT_ADD_LUMA); regw(btm_strt_luma, VPIF_CH2_BTM_STRT_ADD_LUMA);
@ -561,10 +561,10 @@ static inline void ch2_set_videobuf_addr(unsigned long top_strt_luma,
regw(btm_strt_chroma, VPIF_CH2_BTM_STRT_ADD_CHROMA); regw(btm_strt_chroma, VPIF_CH2_BTM_STRT_ADD_CHROMA);
} }
static inline void ch3_set_videobuf_addr(unsigned long top_strt_luma, static inline void ch3_set_video_buf_addr(unsigned long top_strt_luma,
unsigned long btm_strt_luma, unsigned long btm_strt_luma,
unsigned long top_strt_chroma, unsigned long top_strt_chroma,
unsigned long btm_strt_chroma) unsigned long btm_strt_chroma)
{ {
regw(top_strt_luma, VPIF_CH3_TOP_STRT_ADD_LUMA); regw(top_strt_luma, VPIF_CH3_TOP_STRT_ADD_LUMA);
regw(btm_strt_luma, VPIF_CH3_BTM_STRT_ADD_LUMA); regw(btm_strt_luma, VPIF_CH3_BTM_STRT_ADD_LUMA);
@ -574,18 +574,18 @@ static inline void ch3_set_videobuf_addr(unsigned long top_strt_luma,
/* inline function to set buffer addresses in VPIF registers for vbi data */ /* inline function to set buffer addresses in VPIF registers for vbi data */
static inline void ch2_set_vbi_addr(unsigned long top_strt_luma, static inline void ch2_set_vbi_addr(unsigned long top_strt_luma,
unsigned long btm_strt_luma, unsigned long btm_strt_luma,
unsigned long top_strt_chroma, unsigned long top_strt_chroma,
unsigned long btm_strt_chroma) unsigned long btm_strt_chroma)
{ {
regw(top_strt_luma, VPIF_CH2_TOP_STRT_ADD_VANC); regw(top_strt_luma, VPIF_CH2_TOP_STRT_ADD_VANC);
regw(btm_strt_luma, VPIF_CH2_BTM_STRT_ADD_VANC); regw(btm_strt_luma, VPIF_CH2_BTM_STRT_ADD_VANC);
} }
static inline void ch3_set_vbi_addr(unsigned long top_strt_luma, static inline void ch3_set_vbi_addr(unsigned long top_strt_luma,
unsigned long btm_strt_luma, unsigned long btm_strt_luma,
unsigned long top_strt_chroma, unsigned long top_strt_chroma,
unsigned long btm_strt_chroma) unsigned long btm_strt_chroma)
{ {
regw(top_strt_luma, VPIF_CH3_TOP_STRT_ADD_VANC); regw(top_strt_luma, VPIF_CH3_TOP_STRT_ADD_VANC);
regw(btm_strt_luma, VPIF_CH3_BTM_STRT_ADD_VANC); regw(btm_strt_luma, VPIF_CH3_BTM_STRT_ADD_VANC);

6
drivers/media/platform/ti/davinci/vpif_capture.c
View File

@ -632,11 +632,11 @@ static void vpif_config_addr(struct channel_obj *ch, int muxmode)
common = &(ch->common[VPIF_VIDEO_INDEX]); common = &(ch->common[VPIF_VIDEO_INDEX]);
if (VPIF_CHANNEL1_VIDEO == ch->channel_id) if (VPIF_CHANNEL1_VIDEO == ch->channel_id)
common->set_addr = ch1_set_videobuf_addr; common->set_addr = ch1_set_video_buf_addr;
else if (2 == muxmode) else if (2 == muxmode)
common->set_addr = ch0_set_videobuf_addr_yc_nmux; common->set_addr = ch0_set_video_buf_addr_yc_nmux;
else else
common->set_addr = ch0_set_videobuf_addr; common->set_addr = ch0_set_video_buf_addr;
} }
/** /**

2
drivers/media/platform/ti/davinci/vpif_capture.h
View File

@ -50,7 +50,7 @@ struct common_obj {
struct vpif_cap_buffer *next_frm; struct vpif_cap_buffer *next_frm;
/* Used to store pixel format */ /* Used to store pixel format */
struct v4l2_format fmt; struct v4l2_format fmt;
/* Buffer queue used in video-buf */ /* Buffer queue used in vb2 */
struct vb2_queue buffer_queue; struct vb2_queue buffer_queue;
/* Queue of filled frames */ /* Queue of filled frames */
struct list_head dma_queue; struct list_head dma_queue;

6
drivers/media/platform/ti/davinci/vpif_display.c
View File

@ -563,12 +563,12 @@ static void vpif_config_addr(struct channel_obj *ch, int muxmode)
struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX]; struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
if (VPIF_CHANNEL3_VIDEO == ch->channel_id) { if (VPIF_CHANNEL3_VIDEO == ch->channel_id) {
common->set_addr = ch3_set_videobuf_addr; common->set_addr = ch3_set_video_buf_addr;
} else { } else {
if (2 == muxmode) if (2 == muxmode)
common->set_addr = ch2_set_videobuf_addr_yc_nmux; common->set_addr = ch2_set_video_buf_addr_yc_nmux;
else else
common->set_addr = ch2_set_videobuf_addr; common->set_addr = ch2_set_video_buf_addr;
} }
} }

6
drivers/media/platform/ti/davinci/vpif_display.h
View File

@ -64,11 +64,11 @@ struct common_obj {
struct vpif_disp_buffer *next_frm; /* Pointer pointing to next struct vpif_disp_buffer *next_frm; /* Pointer pointing to next
* vb2_buffer */ * vb2_buffer */
struct v4l2_format fmt; /* Used to store the format */ struct v4l2_format fmt; /* Used to store the format */
struct vb2_queue buffer_queue; /* Buffer queue used in struct vb2_queue buffer_queue; /* Buffer queue used in vb2 */
* video-buf */
struct list_head dma_queue; /* Queue of filled frames */ struct list_head dma_queue; /* Queue of filled frames */
spinlock_t irqlock; /* Used in video-buf */ spinlock_t irqlock; /* Used for video buffer
* handling */
/* channel specific parameters */ /* channel specific parameters */
struct mutex lock; /* lock used to access this struct mutex lock; /* lock used to access this

2
drivers/media/platform/ti/omap3isp/ispvideo.c
View File

@ -1071,7 +1071,7 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
* processing might be possible but requires more testing. * processing might be possible but requires more testing.
* *
* Stream start must be delayed until buffers are available at both the input * Stream start must be delayed until buffers are available at both the input
* and output. The pipeline must be started in the videobuf queue callback with * and output. The pipeline must be started in the vb2 queue callback with
* the buffers queue spinlock held. The modules subdev set stream operation must * the buffers queue spinlock held. The modules subdev set stream operation must
* not sleep. * not sleep.
*/ */

6
include/media/davinci/vpbe_display.h
View File

@ -69,13 +69,13 @@ struct vpbe_layer {
struct vpbe_disp_buffer *cur_frm; struct vpbe_disp_buffer *cur_frm;
/* Pointer pointing to next v4l2_buffer */ /* Pointer pointing to next v4l2_buffer */
struct vpbe_disp_buffer *next_frm; struct vpbe_disp_buffer *next_frm;
/* videobuf specific parameters /* vb2 specific parameters
* Buffer queue used in video-buf * Buffer queue used in vb2
*/ */
struct vb2_queue buffer_queue; struct vb2_queue buffer_queue;
/* Queue of filled frames */ /* Queue of filled frames */
struct list_head dma_queue; struct list_head dma_queue;
/* Used in video-buf */ /* Used for video buffer handling */
spinlock_t irqlock; spinlock_t irqlock;
/* V4l2 specific parameters */ /* V4l2 specific parameters */
/* Identifies video device for this layer */ /* Identifies video device for this layer */