On 7/1/19 4:59 PM, Dariusz Marcinkiewicz wrote:
> Use the new cec_notifier_conn_(un)register() functions to
> (un)register the notifier for the HDMI connector, and fill
> in the cec_connector_info.
>
> Signed-off-by: Dariusz Marcinkiewicz <darekm@xxxxxxxxxx>
> ---
> drivers/gpu/drm/sti/sti_hdmi.c | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
> index 6000df6249807..5519b0c397c72 100644
> --- a/drivers/gpu/drm/sti/sti_hdmi.c
> +++ b/drivers/gpu/drm/sti/sti_hdmi.c
> @@ -1250,6 +1250,7 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
> struct drm_device *drm_dev = data;
> struct drm_encoder *encoder;
> struct sti_hdmi_connector *connector;
> + struct cec_connector_info conn_info;
> struct drm_connector *drm_connector;
> struct drm_bridge *bridge;
> int err;
> @@ -1310,6 +1311,14 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
> goto err_sysfs;
> }
>
> + cec_fill_conn_info_from_drm(&conn_info, drm_connector);
> + hdmi->notifier = cec_notifier_conn_register(&hdmi->dev, NULL,
> + &conn_info);
> + if (!hdmi->notifier) {
> + hdmi->drm_connector = NULL;
> + return -ENOMEM;
> + }
> +
> /* Enable default interrupts */
> hdmi_write(hdmi, HDMI_DEFAULT_INT, HDMI_INT_EN);
>
> @@ -1323,6 +1332,10 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
> static void sti_hdmi_unbind(struct device *dev,
> struct device *master, void *data)
> {
> + struct sti_hdmi *hdmi = dev_get_drvdata(dev);
> +
> + cec_notifier_set_phys_addr(hdmi->notifier, CEC_PHYS_ADDR_INVALID);
No need to do this, cec_notifier_conn_unregister() takes care of this.
> + cec_notifier_conn_unregister(hdmi->notifier);
> }
>
> static const struct component_ops sti_hdmi_ops = {
> @@ -1428,10 +1441,6 @@ static int sti_hdmi_probe(struct platform_device *pdev)
> goto release_adapter;
> }
>
> - hdmi->notifier = cec_notifier_get(&pdev->dev);
> - if (!hdmi->notifier)
> - goto release_adapter;
> -
> hdmi->reset = devm_reset_control_get(dev, "hdmi");
> /* Take hdmi out of reset */
> if (!IS_ERR(hdmi->reset))
> @@ -1451,14 +1460,11 @@ static int sti_hdmi_remove(struct platform_device *pdev)
> {
> struct sti_hdmi *hdmi = dev_get_drvdata(&pdev->dev);
>
> - cec_notifier_set_phys_addr(hdmi->notifier, CEC_PHYS_ADDR_INVALID);
> -
> i2c_put_adapter(hdmi->ddc_adapt);
> if (hdmi->audio_pdev)
> platform_device_unregister(hdmi->audio_pdev);
> component_del(&pdev->dev, &sti_hdmi_ops);
>
> - cec_notifier_put(hdmi->notifier);
> return 0;
> }
>
>
Regards,
Hans
