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

media: i2c: rk628: fix display error caused by read resolution error

Browse Source 
Type: Fix
Redmine ID: #461216
Associated modifications: N/A
Test: plugin and plugout the HDMI cable.

Change-Id: Id2be68bc74aa22e8f731f4800c5f22fc6fc8f342
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
This commit is contained in:
Chen Shunqing
2024-01-24 07:06:17 +00:00
parent fb7e8f94dc
commit f1132b51ff
4 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/i2c/rk628/rk628_bt1120_v4l2.c
View File

@@ -234,7 +234,7 @@ static int rk628_bt1120_s_edid(struct v4l2_subdev *sd,
static int rk628_hdmirx_inno_phy_power_on(struct v4l2_subdev *sd);
static int rk628_hdmirx_inno_phy_power_off(struct v4l2_subdev *sd);
static int rk628_hdmirx_phy_setup(struct v4l2_subdev *sd);
static void rk628_bt1120_format_change(struct v4l2_subdev *sd);
static int rk628_bt1120_format_change(struct v4l2_subdev *sd);
static void enable_stream(struct v4l2_subdev *sd, bool enable);
static void rk628_hdmirx_vid_enable(struct v4l2_subdev *sd, bool en);
static void rk628_hdmirx_hpd_ctrl(struct v4l2_subdev *sd, bool en);
@@ -342,9 +342,11 @@ static void rk628_hdmirx_config_all(struct v4l2_subdev *sd)
ret = rk628_hdmirx_phy_setup(sd);
if (ret >= 0 && !rk628_hdmirx_scdc_ced_err(bt1120->rk628)) {
rk628_bt1120_format_change(sd);
bt1120->nosignal = false;
return;
ret = rk628_bt1120_format_change(sd);
if (!ret) {
bt1120->nosignal = false;
return;
}
}
if (ret < 0 || rk628_hdmirx_scdc_ced_err(bt1120->rk628)) {
@@ -876,7 +878,7 @@ static void rk628_bt1120_initial_setup(struct v4l2_subdev *sd)
schedule_delayed_work(&bt1120->delayed_work_enable_hotplug, 4000);
}
static void rk628_bt1120_format_change(struct v4l2_subdev *sd)
static int rk628_bt1120_format_change(struct v4l2_subdev *sd)
{
struct rk628_bt1120 *bt1120 = to_bt1120(sd);
struct v4l2_dv_timings timings;
@@ -884,8 +886,13 @@ static void rk628_bt1120_format_change(struct v4l2_subdev *sd)
.type = V4L2_EVENT_SOURCE_CHANGE,
.u.src_change.changes = V4L2_EVENT_SRC_CH_RESOLUTION,
};
int ret;
rk628_bt1120_get_detected_timings(sd, &timings);
ret = rk628_bt1120_get_detected_timings(sd, &timings);
if (ret) {
v4l2_dbg(1, debug, sd, "%s: get timing fail\n", __func__);
return ret;
}
if (!v4l2_match_dv_timings(&bt1120->timings, &timings, 0, false)) {
/* automatically set timing rather than set by userspace */
rk628_bt1120_s_dv_timings(sd, &timings);
@@ -896,6 +903,8 @@ static void rk628_bt1120_format_change(struct v4l2_subdev *sd)
if (sd->devnode)
v4l2_subdev_notify_event(sd, &rk628_bt1120_ev_fmt);
return 0;
}
static void rk628_bt1120_enable_interrupts(struct v4l2_subdev *sd, bool en)

21
drivers/media/i2c/rk628/rk628_csi_v4l2.c
View File

@@ -342,7 +342,7 @@ static void mipi_dphy_power_off(struct rk628_csi *csi);
static int rk628_hdmirx_inno_phy_power_on(struct v4l2_subdev *sd);
static int rk628_hdmirx_inno_phy_power_off(struct v4l2_subdev *sd);
static int rk628_hdmirx_phy_setup(struct v4l2_subdev *sd);
static void rk628_csi_format_change(struct v4l2_subdev *sd);
static int rk628_csi_format_change(struct v4l2_subdev *sd);
static void enable_stream(struct v4l2_subdev *sd, bool enable);
static void rk628_hdmirx_vid_enable(struct v4l2_subdev *sd, bool en);
static void rk628_csi_set_csi(struct v4l2_subdev *sd);
@@ -466,9 +466,11 @@ static void rk628_hdmirx_config_all(struct v4l2_subdev *sd)
ret = rk628_hdmirx_phy_setup(sd);
if (ret >= 0 && !rk628_hdmirx_scdc_ced_err(csi->rk628)) {
rk628_csi_format_change(sd);
csi->nosignal = false;
return;
ret = rk628_csi_format_change(sd);
if (!ret) {
csi->nosignal = false;
return;
}
}
if (ret < 0 || rk628_hdmirx_scdc_ced_err(csi->rk628)) {
@@ -1358,7 +1360,7 @@ static void rk628_csi_initial_setup(struct v4l2_subdev *sd)
schedule_delayed_work(&csi->delayed_work_enable_hotplug, msecs_to_jiffies(4000));
}
static void rk628_csi_format_change(struct v4l2_subdev *sd)
static int rk628_csi_format_change(struct v4l2_subdev *sd)
{
struct rk628_csi *csi = to_csi(sd);
struct v4l2_dv_timings timings;
@@ -1366,8 +1368,13 @@ static void rk628_csi_format_change(struct v4l2_subdev *sd)
.type = V4L2_EVENT_SOURCE_CHANGE,
.u.src_change.changes = V4L2_EVENT_SRC_CH_RESOLUTION,
};
int ret;
rk628_csi_get_detected_timings(sd, &timings);
ret = rk628_csi_get_detected_timings(sd, &timings);
if (ret) {
v4l2_dbg(1, debug, sd, "%s: get timing fail\n", __func__);
return ret;
}
if (!v4l2_match_dv_timings(&csi->timings, &timings, 0, false)) {
/* automatically set timing rather than set by userspace */
rk628_csi_s_dv_timings(sd, &timings);
@@ -1378,6 +1385,8 @@ static void rk628_csi_format_change(struct v4l2_subdev *sd)
if (sd->devnode)
v4l2_subdev_notify_event(sd, &rk628_csi_ev_fmt);
return 0;
}
static void rk628_csi_enable_csi_interrupts(struct v4l2_subdev *sd, bool en)

3
drivers/media/i2c/rk628/rk628_hdmirx.c
View File

@@ -1439,6 +1439,9 @@ int rk628_hdmirx_get_timings(struct rk628 *rk628,
last_fmt = rk628_hdmirx_get_format(rk628);
}
if (ret && i > 2)
return -EINVAL;
if (ret || (last_w != bt->width) || (last_h != bt->height)
|| (last_fmt != rk628_hdmirx_get_format(rk628)))
cnt = 0;

2
drivers/media/i2c/rk628/rk628_hdmirx.h
View File

@@ -440,7 +440,7 @@
#define MIPI_DATARATE_MBPS_HIGH 1300
#define POLL_INTERVAL_MS 1000
#define RXPHY_CFG_MAX_TIMES 10
#define RXPHY_CFG_MAX_TIMES 5
#define CSITX_ERR_RETRY_TIMES 3
#define USE_4_LANES 4