shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '851545fccc4239eea695dc5191758bb393ec89a9'

Browse Source 
* commit '851545fccc4239eea695dc5191758bb393ec89a9':
  media: rockchip: isp: fix rv1106 cycle kill rkipc null pointer
  arm64: rk3308_linux_defconfig: add CONFIG_DRM_IGNORE_IOTCL_PERMIT
  media: i2c: imx464 fixes exposure error of short frame

Change-Id: I11e1b5d7ad67589e8aa06e14b2dd85e830e766cf
This commit is contained in:
Tao Huang
2023-12-01 20:50:52 +08:00
parent 46c6e52606 851545fccc
commit ddc0738ae6
4 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/configs/rk3308_linux_defconfig
View File

@@ -188,6 +188,7 @@ CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_RK808=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_DRM=y
CONFIG_DRM_IGNORE_IOTCL_PERMIT=y
CONFIG_DRM_ROCKCHIP=y
CONFIG_ROCKCHIP_RGB=y
CONFIG_DRM_PANEL_SIMPLE=y

2
drivers/media/i2c/imx464.c
View File

@@ -1835,7 +1835,7 @@ static int IMX464_set_hdrae(struct IMX464 *IMX464,
__LINE__, rhs1, s_exp_time, rhs1_old,
(rhs1_old + 2 * BRL - fsc + 2));
rhs1 = (rhs1 >> 2) * 4 + 1;
rhs1 = ((rhs1 + 3) >> 2) * 4 + 1;
rhs1_old = rhs1;
if (rhs1 - s_exp_time <= SHR1_MIN) {

49
drivers/media/platform/rockchip/isp/isp_rockit.c
View File

@@ -415,6 +415,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;
@@ -439,6 +479,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];
@@ -457,12 +498,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);
@@ -476,6 +519,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);
}
}
}
}

7
include/soc/rockchip/rockchip_rockit.h
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