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

media: rockchip: isp: fix isp39 output error

Browse Source 
1. fix multistream scaling ouput error
2. fix ack 594 and core clk 297, ldcv output no interrupt
3. fix error of rkisp_sditf_of_match when kasan enable
The buggy address belongs to the variable:
rkisp_sditf_of_match+0xc8/0x100

Change-Id: I1bd251ab93d24a62c80ca3a36a5ff1b004466ebb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2024-03-03 16:43:47 +08:00
committed by Tao Huang
parent 425fdfb988
commit 49fa78e729
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/rockchip/isp/capture_v39.c
View File

@@ -1461,15 +1461,11 @@ static int rkisp_stream_start(struct rkisp_stream *stream)
{
struct rkisp_device *dev = stream->ispdev;
struct v4l2_device *v4l2_dev = &dev->v4l2_dev;
bool async = false;
int ret;
if (stream->id == RKISP_STREAM_LDC)
goto skip;
async = (dev->cap_dev.stream[RKISP_STREAM_MP].streaming ||
dev->cap_dev.stream[RKISP_STREAM_SP].streaming);
/*
* can't be async now, otherwise the latter started stream fails to
* produce mi interrupt.
@@ -1480,7 +1476,7 @@ static int rkisp_stream_start(struct rkisp_stream *stream)
return ret;
}
ret = rkisp_stream_config_rsz(stream, async);
ret = rkisp_stream_config_rsz(stream, false);
if (ret < 0) {
v4l2_err(v4l2_dev, "config rsz failed with error %d\n", ret);
return ret;

3
drivers/media/platform/rockchip/isp/hw.c
View File

@@ -638,8 +638,9 @@ static const struct isp_clk_info rk3568_isp_clk_rate[] = {
};
static const struct isp_clk_info rk3576_isp_clk_rate[] = {
/* clk 300 * 2 equal to aclk issue if ldcv enable */
{
.clk_rate = 300,
.clk_rate = 400,
.refer_data = 1920, //width
}, {
.clk_rate = 400,

1
drivers/media/platform/rockchip/isp/isp_sditf.c
View File

@@ -230,6 +230,7 @@ static const struct of_device_id rkisp_sditf_of_match[] = {
{
.compatible = "rockchip,rkisp-sditf",
},
{},
};
struct platform_driver rkisp_sditf_drv = {