On 8/7/19 10:52 AM, Dariusz Marcinkiewicz wrote:
> Use the new cec_notifier_cec_adap_(un)register() functions to
> (un)register the notifier for the CEC adapter.
>
> Also adds CEC_CAP_CONNECTOR_INFO capability to the adapter.
>
> Changes since v3:
> - add CEC_CAP_CONNECTOR_INFO to cec_allocate_adapter,
> - replace CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT |
> CEC_CAP_RC | CEC_CAP_PASSTHROUGH with CEC_CAP_DEFAULTS.
>
> Signed-off-by: Dariusz Marcinkiewicz <darekm@xxxxxxxxxx>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
Tested-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
Tested with a Banana Pi M3 Allwinner A83T.
Regards,
Hans
> ---
> drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
> index 6c323510f1288..361acff2111cf 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
> @@ -259,8 +259,8 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev)
> dw_hdmi_write(cec, 0, HDMI_CEC_POLARITY);
>
> cec->adap = cec_allocate_adapter(&dw_hdmi_cec_ops, cec, "dw_hdmi",
> - CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT |
> - CEC_CAP_RC | CEC_CAP_PASSTHROUGH,
> + CEC_CAP_DEFAULTS |
> + CEC_CAP_CONNECTOR_INFO,
> CEC_MAX_LOG_ADDRS);
> if (IS_ERR(cec->adap))
> return PTR_ERR(cec->adap);
> @@ -281,13 +281,14 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev)
> if (ret < 0)
> return ret;
>
> - cec->notify = cec_notifier_get(pdev->dev.parent);
> + cec->notify = cec_notifier_cec_adap_register(pdev->dev.parent,
> + NULL, cec->adap);
> if (!cec->notify)
> return -ENOMEM;
>
> ret = cec_register_adapter(cec->adap, pdev->dev.parent);
> if (ret < 0) {
> - cec_notifier_put(cec->notify);
> + cec_notifier_cec_adap_unregister(cec->notify);
> return ret;
> }
>
> @@ -297,8 +298,6 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev)
> */
> devm_remove_action(&pdev->dev, dw_hdmi_cec_del, cec);
>
> - cec_register_cec_notifier(cec->adap, cec->notify);
> -
> return 0;
> }
>
> @@ -306,8 +305,8 @@ static int dw_hdmi_cec_remove(struct platform_device *pdev)
> {
> struct dw_hdmi_cec *cec = platform_get_drvdata(pdev);
>
> + cec_notifier_cec_adap_unregister(cec->notify);
> cec_unregister_adapter(cec->adap);
> - cec_notifier_put(cec->notify);
>
> return 0;
> }
>
