diff --git a/drivers/gpu/drm/bridge/lt9611uxc.c b/drivers/gpu/drm/bridge/lt9611uxc.c index 7ff34f4c562e..dbf438b759d5 100644 --- a/drivers/gpu/drm/bridge/lt9611uxc.c +++ b/drivers/gpu/drm/bridge/lt9611uxc.c @@ -42,7 +42,6 @@ #define READ_BUF_MAX_SIZE 64 #define WRITE_BUF_MAX_SIZE 64 #define HPD_UEVENT_BUFFER_SIZE 30 -#define VERSION_NUM 0x32 struct lt9611_reg_cfg { u8 reg; @@ -123,10 +122,14 @@ struct lt9611 { struct drm_display_mode curr_mode; struct lt9611_video_cfg video_cfg; + struct workqueue_struct *wq; + struct work_struct work; + u8 edid_buf[EDID_SEG_SIZE]; u8 i2c_wbuf[WRITE_BUF_MAX_SIZE]; u8 i2c_rbuf[READ_BUF_MAX_SIZE]; bool hdmi_mode; + bool hpd_support; enum lt9611_fw_upgrade_status fw_status; }; @@ -150,6 +153,40 @@ static struct lt9611_timing_info lt9611_supp_timing_cfg[] = { {0xffff, 0xffff, 0xff, 0xff, 0xff}, }; +static void lt9611_hpd_work(struct work_struct *work) +{ + char name[32], status[32]; + char *envp[5]; + char *event_string = "HOTPLUG=1"; + enum drm_connector_status last_status; + struct drm_device *dev = NULL; + struct lt9611 *pdata = container_of(work, struct lt9611, work); + + if (!pdata || !pdata->connector.funcs || + !pdata->connector.funcs->detect) + return; + + dev = pdata->connector.dev; + last_status = pdata->connector.status; + pdata->connector.status = + pdata->connector.funcs->detect(&pdata->connector, true); + + if (last_status == pdata->connector.status) + return; + + scnprintf(name, 32, "name=%s", + pdata->connector.name); + scnprintf(status, 32, "status=%s", + drm_get_connector_status_name(pdata->connector.status)); + pr_debug("[%s]:[%s]\n", name, status); + envp[0] = name; + envp[1] = status; + envp[2] = event_string; + envp[3] = NULL; + envp[4] = NULL; + kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); +} + static struct lt9611 *bridge_to_lt9611(struct drm_bridge *bridge) { return container_of(bridge, struct lt9611, bridge); @@ -871,7 +908,30 @@ static int lt9611_read_device_id(struct lt9611 *pdata) static irqreturn_t lt9611_irq_thread_handler(int irq, void *dev_id) { + u8 irq_status = 0, hpd_status = 0; + struct lt9611 *pdata = (struct lt9611 *)dev_id; + pr_debug("irq_thread_handler\n"); + + lt9611_write_byte(pdata, 0xFF, 0x80); + lt9611_write_byte(pdata, 0xEE, 0x01); + lt9611_write_byte(pdata, 0xFF, 0xB0); + if (!lt9611_read(pdata, 0x22, &irq_status, 1)) { + pr_debug("irq status 0x%x\n", irq_status); + if (irq_status) { + lt9611_write_byte(pdata, 0x22, 0); + lt9611_read(pdata, 0x23, &hpd_status, 1); + pr_debug("irq hdp status 0x%x\n", hpd_status); + } + } else + pr_err("get irq status failed\n"); + lt9611_write_byte(pdata, 0xFF, 0x80); + lt9611_write_byte(pdata, 0xEE, 0x00); + + msleep(50); + if (irq_status & (BIT(0) | BIT(1))) + queue_work(pdata->wq, &pdata->work); + return IRQ_HANDLED; } @@ -1300,7 +1360,24 @@ static void lt9611_get_video_cfg(struct lt9611 *pdata, static enum drm_connector_status lt9611_connector_detect(struct drm_connector *connector, bool force) { + u8 hpd_status = 0; struct lt9611 *pdata = connector_to_lt9611(connector); + + pdata->status = connector_status_connected; + if (force && pdata->hpd_support) { + lt9611_write_byte(pdata, 0xFF, 0x80); + lt9611_write_byte(pdata, 0xEE, 0x01); + lt9611_write_byte(pdata, 0xFF, 0x80); + if (!lt9611_read(pdata, 0x23, &hpd_status, 1)) { + if (hpd_status & BIT(1)) + pdata->status = connector_status_connected; + pr_debug("hpd status %x\n", hpd_status); + } else + pr_err("read hpd status failed\n"); + lt9611_write_byte(pdata, 0xFF, 0x80); + lt9611_write_byte(pdata, 0xEE, 0x00); + msleep(50); + } else pdata->status = connector_status_connected; return pdata->status; @@ -1653,6 +1730,7 @@ static int lt9611_probe(struct i2c_client *client, { struct lt9611 *pdata; int ret = 0; + u8 chip_version = 0; if (!client || !client->dev.of_node) { pr_err("invalid input\n"); @@ -1719,8 +1797,18 @@ static int lt9611_probe(struct i2c_client *client, i2c_set_clientdata(client, pdata); dev_set_drvdata(&client->dev, pdata); - if (lt9611_get_version(pdata) == VERSION_NUM) { + ret = lt9611_sysfs_init(&client->dev); + if (ret) { + pr_err("sysfs init failed\n"); + goto err_sysfs_init; + } + + chip_version = lt9611_get_version(pdata); + pdata->hpd_support = false; + if (chip_version) { pr_info("LT9611 works, no need to upgrade FW\n"); + if (chip_version >= 0x40) + pdata->hpd_support = true; } else { ret = request_firmware_nowait(THIS_MODULE, true, "lt9611_fw.bin", &client->dev, GFP_KERNEL, pdata, @@ -1733,12 +1821,6 @@ static int lt9611_probe(struct i2c_client *client, return 0; } - ret = lt9611_sysfs_init(&client->dev); - if (ret) { - pr_err("sysfs init failed\n"); - goto err_sysfs_init; - } - #if IS_ENABLED(CONFIG_OF) pdata->bridge.of_node = client->dev.of_node; #endif @@ -1746,6 +1828,13 @@ static int lt9611_probe(struct i2c_client *client, pdata->bridge.funcs = <9611_bridge_funcs; drm_bridge_add(&pdata->bridge); + pdata->wq = create_singlethread_workqueue("lt9611_wk"); + if (!pdata->wq) { + pr_err("Error creating lt9611 wq\n"); + goto err_sysfs_init; + } + INIT_WORK(&pdata->work, lt9611_hpd_work); + return 0; err_sysfs_init: @@ -1789,6 +1878,8 @@ static int lt9611_remove(struct i2c_client *client) } } + if (pdata->wq) + destroy_workqueue(pdata->wq); end: return ret; }