| Message ID | 20170329141543.32935-5-hverkuil@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Mar 29, 2017 at 04:15:36PM +0200, Hans Verkuil wrote: > From: Hans Verkuil <hans.verkuil@cisco.com> > > 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> > --- > drivers/gpu/drm/exynos/exynos_hdmi.c | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) > Acked-by: Krzysztof Kozlowski <krzk@kernel.org> (you still need Exynos DRM maintainer ack) Best regards, Krzysztof
On Wed, Mar 29, 2017 at 04:15:36PM +0200, Hans Verkuil wrote: > + cec_notifier_set_phys_addr(hdata->notifier, > + cec_get_edid_phys_addr(edid)); This pattern causes problems - can we have the notifier taking the EDID please, and stubs in cec-notifier.h to stub that out? Maybe something like cec_notifier_set_phys_addr_from_edid(edid) ? Having converted the tda998x code over to your new notifier, the 0-day builder reported this tonight: >> ERROR: "cec_get_edid_phys_addr" [drivers/gpu/drm/i2c/tda998x.ko] undefined! which is caused exactly by this problem. I can add #ifdefs into the tda998x driver, but as you're already stubbing out cec_notifier_set_phys_addr() in cec-notifier.h, it would be stupid to have to resort to #ifdefs in driver code to solve this issue. Thanks.
On 31/03/17 00:35, Russell King - ARM Linux wrote: > On Wed, Mar 29, 2017 at 04:15:36PM +0200, Hans Verkuil wrote: >> + cec_notifier_set_phys_addr(hdata->notifier, >> + cec_get_edid_phys_addr(edid)); > > This pattern causes problems - can we have the notifier taking the EDID > please, and stubs in cec-notifier.h to stub that out? > > Maybe something like cec_notifier_set_phys_addr_from_edid(edid) ? Good point. I've added this, and as an extra bonus this allowed me to drop the first cec-edid patch. > > Having converted the tda998x code over to your new notifier, the 0-day > builder reported this tonight: > >>> ERROR: "cec_get_edid_phys_addr" [drivers/gpu/drm/i2c/tda998x.ko] undefined! > > which is caused exactly by this problem. I can add #ifdefs into the > tda998x driver, but as you're already stubbing out > cec_notifier_set_phys_addr() in cec-notifier.h, it would be stupid to > have to resort to #ifdefs in driver code to solve this issue. Will post a new series today. Thanks for pointing this out. A general note: I am considering merging cec-notifier and cec-edid into the CEC module itself. However, I want to get this series in first before I start moving things around. It's been delayed long enough already. Regards, Hans
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 88ccc0469316..2afc8b8052c2 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -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,8 @@ 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(hdata->notifier, + cec_get_edid_phys_addr(edid)); ret = drm_add_edid_modes(connector, edid); @@ -1503,6 +1509,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 +1885,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 +1919,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))