TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: rockchip: isp: fix rv1106 cycle kill rkipc null pointer

Browse Source 
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: I070878cb4d0fc31adabc76885b9090e4da982fc1
This commit is contained in:
Mingwei Yan
2023-11-20 19:17:36 +08:00
committed by Tao Huang
parent 7c102d5c0b
commit 851545fccc
2 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/platform/rockchip/isp/isp_rockit.c
+48 -1
View File
@@ -426,6 +426,46 @@ int rkisp_rockit_free_tb_stream_buf(struct rockit_cfg *input_rockit_cfg)
}
EXPORT_SYMBOL(rkisp_rockit_free_tb_stream_buf);
int rkisp_rockit_free_stream_buf(struct rockit_cfg *input_rockit_cfg)
{
struct rkisp_stream *stream;
struct rkisp_buffer *buf;
unsigned long lock_flags = 0;
if (!input_rockit_cfg)
return -EINVAL;
stream = rkisp_rockit_get_stream(input_rockit_cfg);
if (!stream)
return -EINVAL;
if (stream->streaming)
return 0;
spin_lock_irqsave(&stream->vbq_lock, lock_flags);
if (stream->curr_buf) {
list_add_tail(&stream->curr_buf->queue, &stream->buf_queue);
if (stream->curr_buf == stream->next_buf)
stream->next_buf = NULL;
stream->curr_buf = NULL;
}
if (stream->next_buf) {
list_add_tail(&stream->next_buf->queue, &stream->buf_queue);
stream->next_buf = NULL;
}
while (!list_empty(&stream->buf_queue)) {
buf = list_first_entry(&stream->buf_queue,
struct rkisp_buffer, queue);
list_del(&buf->queue);
}
rkisp_rockit_buf_state_clear(stream);
spin_unlock_irqrestore(&stream->vbq_lock, lock_flags);
rkisp_rockit_buf_free(stream);
return 0;
}
EXPORT_SYMBOL(rkisp_rockit_free_stream_buf);
void rkisp_rockit_buf_state_clear(struct rkisp_stream *stream)
{
struct rkisp_stream_cfg *stream_cfg;
@@ -451,6 +491,7 @@ int rkisp_rockit_buf_free(struct rkisp_stream *stream)
return -EINVAL;
stream_cfg = &rockit_cfg->rkisp_dev_cfg[dev_id].rkisp_stream_cfg[stream->id];
mutex_lock(&stream_cfg->freebuf_lock);
for (i = 0; i < ROCKIT_BUF_NUM_MAX; i++) {
if (stream_cfg->rkisp_buff[i]) {
isprk_buf = (struct rkisp_rockit_buffer *)stream_cfg->rkisp_buff[i];
@@ -463,12 +504,14 @@ int rkisp_rockit_buf_free(struct rkisp_stream *stream)
stream_cfg->rkisp_buff[i] = NULL;
}
}
mutex_unlock(&stream_cfg->freebuf_lock);
return 0;
}
void rkisp_rockit_dev_init(struct rkisp_device *dev)
{
int i;
struct rkisp_stream_cfg *stream_cfg;
int i, j;
if (rockit_cfg == NULL) {
rockit_cfg = kzalloc(sizeof(struct rockit_cfg), GFP_KERNEL);
@@ -482,6 +525,10 @@ void rkisp_rockit_dev_init(struct rkisp_device *dev)
dev->hw_dev->isp[i]->name;
rockit_cfg->rkisp_dev_cfg[i].isp_dev =
dev->hw_dev->isp[i];
for (j = 0; j < RKISP_MAX_STREAM; j++) {
stream_cfg = &rockit_cfg->rkisp_dev_cfg[i].rkisp_stream_cfg[j];
mutex_init(&stream_cfg->freebuf_lock);
}
}
}
}
include/soc/rockchip/rockchip_rockit.h
+7
View File
@@ -35,6 +35,7 @@ struct rkisp_stream_cfg {
int cur_fps;
u64 old_time;
bool is_discard;
struct mutex freebuf_lock;
};
struct ISP_VIDEO_FRAMES {
@@ -132,6 +133,7 @@ int rkisp_rockit_config_stream(struct rockit_cfg *input_rockit_cfg,
int rkisp_rockit_get_tb_stream_info(struct rockit_cfg *input_rockit_cfg,
struct rkisp_tb_stream_info *info);
int rkisp_rockit_free_tb_stream_buf(struct rockit_cfg *input_rockit_cfg);
int rkisp_rockit_free_stream_buf(struct rockit_cfg *input_rockit_cfg);
void *rkcif_rockit_function_register(void *function, int cmd);
int rkcif_rockit_get_cifdev(char **name);
@@ -175,6 +177,11 @@ static inline int rkisp_rockit_free_tb_stream_buf(struct rockit_cfg *input_rocki
return -EINVAL;
}
static inline int rkisp_rockit_free_stream_buf(struct rockit_cfg *input_rockit_cfg)
{
return -EINVAL;
}
#endif
#endif