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

media: i2c: it66353: fix it66353 no lock.

Browse Source 
1.Config ddc/hpd/5v no bypass.
2.Add mutex_lock on dev_loop/hdmisel.
3.Fix tx_is_sink_hpd_high return err.
4.Config switch port hpd toggle time 2s.
5.Set EDID to print a 16-byte line.

Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I26ad6b12e243405684785352c10f7835729c1bf4
This commit is contained in:
Wangqiang Guo
2022-07-22 09:01:48 +00:00
committed by Tao Huang
parent d360ef05db
commit e3006fca4f
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/media/i2c/it66353/it66353.c
View File

@@ -48,7 +48,7 @@
do {\
if (debug_on)\
printk(__VA_ARGS__);\
} while (0)\
} while (0)
/*
* ********* compile options ***********
* CHECK_DEV_PRESENT:
@@ -77,10 +77,10 @@ struct it66353_dev {
struct device *dev;
struct miscdevice miscdev;
struct i2c_client *client;
struct mutex confctl_mutex;
struct timer_list timer;
struct delayed_work work_i2c_poll;
struct mutex poll_lock;
struct mutex port_lock;
struct task_struct *poll_task;
bool auto_switch_en;
bool is_chip_ready;
@@ -265,7 +265,9 @@ static void it66353_work_i2c_poll(struct work_struct *work)
struct it66353_dev *it66353 =
container_of(dwork, struct it66353_dev, work_i2c_poll);
mutex_lock(&it66353->poll_lock);
it66353_dev_loop();
mutex_unlock(&it66353->poll_lock);
schedule_delayed_work(&it66353->work_i2c_poll, msecs_to_jiffies(50));
}
@@ -288,6 +290,7 @@ static ssize_t it66353_hdmirxsel_store(struct device *dev,
u32 hdmirxstate = 0;
int ret;
mutex_lock(&it66353->port_lock);
ret = kstrtouint(buf, 10, &hdmirxstate);
if (!ret && hdmirxstate >= 0 && hdmirxstate <= RX_PORT_COUNT) {
it66353->hdmi_rx_sel = hdmirxstate;
@@ -302,6 +305,7 @@ static ssize_t it66353_hdmirxsel_store(struct device *dev,
dev_info(it66353->dev, "%s: write hdmi_rx_sel failed!!!, hdmirxstate:%d \n",
__func__, hdmirxstate);
}
mutex_unlock(&it66353->port_lock);
return count;
}
@@ -343,6 +347,9 @@ static int it66353_probe(struct i2c_client *client,
it66353->dev = dev;
client->flags |= I2C_CLIENT_SCCB;
mutex_init(&it66353->poll_lock);
mutex_init(&it66353->port_lock);
ret = misc_register(&it66353_miscdev);
if (ret) {
dev_err(it66353->dev,
@@ -357,7 +364,7 @@ static int it66353_probe(struct i2c_client *client,
&dev_attr_it66353_hdmirxsel);
if (ret) {
dev_err(it66353->dev, "failed to create attr hdmirxsel!\n");
return ret;
goto err0;
}
it66353_options_init();
schedule_delayed_work(&it66353->work_i2c_poll, msecs_to_jiffies(10));
@@ -365,14 +372,20 @@ static int it66353_probe(struct i2c_client *client,
client->name, client->addr << 1,
client->adapter->name);
return 0;
err0:
misc_deregister(&it66353_miscdev);
return ret;
}
static int it66353_remove(struct i2c_client *client)
{
cancel_delayed_work_sync(&it66353->work_i2c_poll);
mutex_destroy(&it66353->confctl_mutex);
device_remove_file(it66353_miscdev.this_device,
&dev_attr_it66353_hdmirxsel);
misc_deregister(&it66353_miscdev);
mutex_destroy(&it66353->poll_lock);
mutex_destroy(&it66353->port_lock);
return 0;
}
@@ -414,22 +427,10 @@ MODULE_LICENSE("GPL v2");
static void _pr_buf(void *buffer, int length)
{
int i;
u8 *buf = (u8 *)buffer;
u8 data = 0;
int pr_len = 16;
while (length) {
if (length < pr_len)
pr_len = length;
for (i = 0; i < pr_len; i++) {
data = *buf;
DEBUG("%02x ", data);
buf++;
}
DEBUG("\r\n");
length -= pr_len;
}
print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE, 16, 1, buf,
length, false);
}
u8 it66353_h2swwr(u8 offset, u8 wdata)
@@ -572,9 +573,9 @@ void it66353_chgrxbank(u8 bankno)
static bool _tx_is_sink_hpd_high(void)
{
if (it66353_h2swrd(0x11) & 0x20)
return FALSE;
else
return TRUE;
else
return FALSE;
}
static bool _tx_ddcwait(void)

6
drivers/media/i2c/it66353/it66353_opts.c
View File

@@ -65,9 +65,9 @@
IT6635_RX_OPTIONS it66353_s_RxOpts = {
0xC3, // u8 tag1;
1, // u8 EnRxDDCBypass;
0, // u8 EnRxDDCBypass;
0, // u8 EnRxPWR5VBypass;
1, // u8 EnRxHPDBypass;
0, // u8 EnRxHPDBypass;
1, // u8 TryFixedEQFirst;
1, // u8 EnableAutoEQ;
1, // u8 NonActivePortReplyHPD;
@@ -75,7 +75,7 @@ IT6635_RX_OPTIONS it66353_s_RxOpts = {
{DEFAULT_RS_IDX, DEFAULT_RS_IDX, DEFAULT_RS_IDX}, // u8 DefaultEQ[3];
1, // u8 FixIncorrectHdmiEnc;
0, // u8 HPDOutputInverse;
HPD_TOGGLE_TIMEOUT_400MS, // u8 HPDTogglePeriod;
HPD_TOGGLE_TIMEOUT_2SEC, // u8 HPDTogglePeriod;
1, // u8 TxOEAlignment;
(u8)sizeof(IT6635_RX_OPTIONS), // u8 str_size;
};