mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
[media] exynos_hdmi: add CEC notifier support
Implement the CEC notifier support to allow CEC drivers to be informed when there is a new physical address. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
parent
ed3022de6d
commit
278c811c5d
1 changed files with 17 additions and 2 deletions
|
@ -43,6 +43,8 @@
|
|||
|
||||
#include <drm/exynos_drm.h>
|
||||
|
||||
#include <media/cec-notifier.h>
|
||||
|
||||
#include "exynos_drm_drv.h"
|
||||
#include "exynos_drm_crtc.h"
|
||||
|
||||
|
@ -119,6 +121,7 @@ struct hdmi_context {
|
|||
bool dvi_mode;
|
||||
struct delayed_work hotplug_work;
|
||||
struct drm_display_mode current_mode;
|
||||
struct cec_notifier *notifier;
|
||||
const struct hdmi_driver_data *drv_data;
|
||||
|
||||
void __iomem *regs;
|
||||
|
@ -822,6 +825,7 @@ static enum drm_connector_status hdmi_detect(struct drm_connector *connector,
|
|||
if (gpiod_get_value(hdata->hpd_gpio))
|
||||
return connector_status_connected;
|
||||
|
||||
cec_notifier_set_phys_addr(hdata->notifier, CEC_PHYS_ADDR_INVALID);
|
||||
return connector_status_disconnected;
|
||||
}
|
||||
|
||||
|
@ -860,6 +864,7 @@ static int hdmi_get_modes(struct drm_connector *connector)
|
|||
edid->width_cm, edid->height_cm);
|
||||
|
||||
drm_mode_connector_update_edid_property(connector, edid);
|
||||
cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
|
||||
|
||||
ret = drm_add_edid_modes(connector, edid);
|
||||
|
||||
|
@ -1503,6 +1508,7 @@ static void hdmi_disable(struct drm_encoder *encoder)
|
|||
if (funcs && funcs->disable)
|
||||
(*funcs->disable)(crtc);
|
||||
|
||||
cec_notifier_set_phys_addr(hdata->notifier, CEC_PHYS_ADDR_INVALID);
|
||||
cancel_delayed_work(&hdata->hotplug_work);
|
||||
|
||||
hdmiphy_disable(hdata);
|
||||
|
@ -1878,15 +1884,22 @@ static int hdmi_probe(struct platform_device *pdev)
|
|||
}
|
||||
}
|
||||
|
||||
hdata->notifier = cec_notifier_get(&pdev->dev);
|
||||
if (hdata->notifier == NULL) {
|
||||
ret = -ENOMEM;
|
||||
goto err_hdmiphy;
|
||||
}
|
||||
|
||||
pm_runtime_enable(dev);
|
||||
|
||||
ret = component_add(&pdev->dev, &hdmi_component_ops);
|
||||
if (ret)
|
||||
goto err_disable_pm_runtime;
|
||||
goto err_notifier_put;
|
||||
|
||||
return ret;
|
||||
|
||||
err_disable_pm_runtime:
|
||||
err_notifier_put:
|
||||
cec_notifier_put(hdata->notifier);
|
||||
pm_runtime_disable(dev);
|
||||
|
||||
err_hdmiphy:
|
||||
|
@ -1905,9 +1918,11 @@ static int hdmi_remove(struct platform_device *pdev)
|
|||
struct hdmi_context *hdata = platform_get_drvdata(pdev);
|
||||
|
||||
cancel_delayed_work_sync(&hdata->hotplug_work);
|
||||
cec_notifier_set_phys_addr(hdata->notifier, CEC_PHYS_ADDR_INVALID);
|
||||
|
||||
component_del(&pdev->dev, &hdmi_component_ops);
|
||||
|
||||
cec_notifier_put(hdata->notifier);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
if (!IS_ERR(hdata->reg_hdmi_en))
|
||||
|
|
Loading…
Reference in a new issue