diff options
| author | Andrzej Hajda | 2015-07-09 16:28:07 +0200 |
|---|---|---|
| committer | Inki Dae | 2015-08-16 03:23:31 +0200 |
| commit | ef6ce28bc7c529d4d0b8c699d26fb568208bc305 (patch) | |
| tree | 8d9cced76b1e602227cce2e4a9bd32779a77901f /drivers/gpu/drm/exynos/exynos_hdmi.c | |
| parent | drm/exynos/hdmi: remove old platform data code (diff) | |
| download | kernel-qcow2-linux-ef6ce28bc7c529d4d0b8c699d26fb568208bc305.tar.gz kernel-qcow2-linux-ef6ce28bc7c529d4d0b8c699d26fb568208bc305.tar.xz kernel-qcow2-linux-ef6ce28bc7c529d4d0b8c699d26fb568208bc305.zip | |
drm/exynos/hdmi: Simplify HPD gpio handling
GPIO is tested only in hdmi_detect, so there is no reason to set it in
other places and to preserve its value in context.
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_hdmi.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 3cf09bb995a3..1d07bdf78776 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -186,7 +186,6 @@ struct hdmi_context { struct drm_device *drm_dev; struct drm_connector connector; struct drm_encoder *encoder; - bool hpd; bool powered; bool dvi_mode; struct mutex hdmi_mutex; @@ -1037,10 +1036,10 @@ static enum drm_connector_status hdmi_detect(struct drm_connector *connector, { struct hdmi_context *hdata = ctx_from_connector(connector); - hdata->hpd = gpio_get_value(hdata->hpd_gpio); + if (gpio_get_value(hdata->hpd_gpio)) + return connector_status_connected; - return hdata->hpd ? connector_status_connected : - connector_status_disconnected; + return connector_status_disconnected; } static void hdmi_connector_destroy(struct drm_connector *connector) @@ -2156,10 +2155,6 @@ static void hdmi_hotplug_work_func(struct work_struct *work) hdata = container_of(work, struct hdmi_context, hotplug_work.work); - mutex_lock(&hdata->hdmi_mutex); - hdata->hpd = gpio_get_value(hdata->hpd_gpio); - mutex_unlock(&hdata->hdmi_mutex); - if (hdata->drm_dev) drm_helper_hpd_irq_event(hdata->drm_dev); } @@ -2428,8 +2423,6 @@ out_get_phy_port: goto err_hdmiphy; } - hdata->hpd = gpio_get_value(hdata->hpd_gpio); - INIT_DELAYED_WORK(&hdata->hotplug_work, hdmi_hotplug_work_func); ret = devm_request_threaded_irq(dev, hdata->irq, NULL, |