From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E924EC3A59D for ; Mon, 19 Aug 2019 09:32:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C84092087E for ; Mon, 19 Aug 2019 09:32:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726798AbfHSJcb (ORCPT ); Mon, 19 Aug 2019 05:32:31 -0400 Received: from lb3-smtp-cloud8.xs4all.net ([194.109.24.29]:42373 "EHLO lb3-smtp-cloud8.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726491AbfHSJcb (ORCPT ); Mon, 19 Aug 2019 05:32:31 -0400 Received: from [192.168.2.10] ([46.9.232.237]) by smtp-cloud8.xs4all.net with ESMTPA id ze1YhLrRiDqPeze1bhneig; Mon, 19 Aug 2019 11:32:29 +0200 Subject: Re: [PATCH v7 8/9] drm: dw-hdmi: use cec_notifier_conn_(un)register To: Dariusz Marcinkiewicz , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org Cc: Jernej Skrabec , Jonas Karlman , David Airlie , Neil Armstrong , Douglas Anderson , linux-kernel@vger.kernel.org, Sean Paul , Laurent Pinchart , Sam Ravnborg References: <20190814104520.6001-1-darekm@google.com> <20190814104520.6001-9-darekm@google.com> From: Hans Verkuil Message-ID: Date: Mon, 19 Aug 2019 11:32:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190814104520.6001-9-darekm@google.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfDeYpAUoJZkgdMJ+EP+S/3l+7QO+nrEOJjD6cP7xavE/iQMaVkUBFGDwadmDtXdbVv9PR7moBacAb18gbwD4r0uwhYsDUbzPIcqfCHD85v5kACa+O64i 37V0mTIYXz9E5fX12kqN1/iCxDlEwagZcZbX6+1hv3pOmHepZy0VRkM3Td1IZQAGqhvzQDZgqGYnfj4TYMHFXv4ulL1NvwBdzOfi7Jw07737R5ABpy6FP4TQ tUHpKoUD/qv9HM/1YgPlMU6z22fmyJK6b8PVijn18aVaUI54tR/MCmwShsauVElSuWN4nUvYryeH0PFx1JhoPNWTSUN1tGygd0gMkmf/ENQjUHJXEjFMm1I1 k8H4c5OVgqkyWigwnxPqJZscn3rBPGcVItQta2Y2RjbVQ93GVuFPx6KwWPLeek3b70Bn9cIea7ZIbULPjAWt8OEOSYMxEtApTsRDAisR/B1GVBVqUDHB9AsS QnT3lVCT0EyNZRh4pGNWZZTrwwSzchYdZjpyAqh+64JTn3jbBVj46AyFOelCbT941WPoxR6XsOBOE9MrMdk+Vp6x08Nzebt+jEEITg== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 8/14/19 12:45 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. > > Changes since v6: > - move cec_notifier_conn_unregister to a bridge detach > function, > - add a mutex protecting a CEC notifier. > Changes since v4: > - typo fix > Changes since v2: > - removed unnecessary NULL check before a call to > cec_notifier_conn_unregister, > - use cec_notifier_phys_addr_invalidate to invalidate physical > address. > Changes since v1: > Add memory barrier to make sure that the notifier > becomes visible to the irq thread once it is fully > constructed. > > Signed-off-by: Dariusz Marcinkiewicz Acked-by: Hans Verkuil Regards, Hans > --- > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 45 +++++++++++++++-------- > 1 file changed, 30 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > index 83b94b66e464e..55162c9092f71 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > @@ -190,6 +190,7 @@ struct dw_hdmi { > void (*enable_audio)(struct dw_hdmi *hdmi); > void (*disable_audio)(struct dw_hdmi *hdmi); > > + struct mutex cec_notifier_mutex; > struct cec_notifier *cec_notifier; > }; > > @@ -2194,6 +2195,8 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge) > struct dw_hdmi *hdmi = bridge->driver_private; > struct drm_encoder *encoder = bridge->encoder; > struct drm_connector *connector = &hdmi->connector; > + struct cec_connector_info conn_info; > + struct cec_notifier *notifier; > > connector->interlace_allowed = 1; > connector->polled = DRM_CONNECTOR_POLL_HPD; > @@ -2207,9 +2210,29 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge) > > drm_connector_attach_encoder(connector, encoder); > > + cec_fill_conn_info_from_drm(&conn_info, connector); > + > + notifier = cec_notifier_conn_register(hdmi->dev, NULL, &conn_info); > + if (!notifier) > + return -ENOMEM; > + > + mutex_lock(&hdmi->cec_notifier_mutex); > + hdmi->cec_notifier = notifier; > + mutex_unlock(&hdmi->cec_notifier_mutex); > + > return 0; > } > > +static void dw_hdmi_bridge_detach(struct drm_bridge *bridge) > +{ > + struct dw_hdmi *hdmi = bridge->driver_private; > + > + mutex_lock(&hdmi->cec_notifier_mutex); > + cec_notifier_conn_unregister(hdmi->cec_notifier); > + hdmi->cec_notifier = NULL; > + mutex_unlock(&hdmi->cec_notifier_mutex); > +} > + > static enum drm_mode_status > dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge, > const struct drm_display_mode *mode) > @@ -2266,6 +2289,7 @@ static void dw_hdmi_bridge_enable(struct drm_bridge *bridge) > > static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = { > .attach = dw_hdmi_bridge_attach, > + .detach = dw_hdmi_bridge_detach, > .enable = dw_hdmi_bridge_enable, > .disable = dw_hdmi_bridge_disable, > .mode_set = dw_hdmi_bridge_mode_set, > @@ -2373,9 +2397,11 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) > phy_stat & HDMI_PHY_HPD, > phy_stat & HDMI_PHY_RX_SENSE); > > - if ((phy_stat & (HDMI_PHY_RX_SENSE | HDMI_PHY_HPD)) == 0) > - cec_notifier_set_phys_addr(hdmi->cec_notifier, > - CEC_PHYS_ADDR_INVALID); > + if ((phy_stat & (HDMI_PHY_RX_SENSE | HDMI_PHY_HPD)) == 0) { > + mutex_lock(&hdmi->cec_notifier_mutex); > + cec_notifier_phys_addr_invalidate(hdmi->cec_notifier); > + mutex_unlock(&hdmi->cec_notifier_mutex); > + } > } > > if (intr_stat & HDMI_IH_PHY_STAT0_HPD) { > @@ -2561,6 +2587,7 @@ __dw_hdmi_probe(struct platform_device *pdev, > > mutex_init(&hdmi->mutex); > mutex_init(&hdmi->audio_mutex); > + mutex_init(&hdmi->cec_notifier_mutex); > spin_lock_init(&hdmi->audio_lock); > > ddc_node = of_parse_phandle(np, "ddc-i2c-bus", 0); > @@ -2693,12 +2720,6 @@ __dw_hdmi_probe(struct platform_device *pdev, > if (ret) > goto err_iahb; > > - hdmi->cec_notifier = cec_notifier_get(dev); > - if (!hdmi->cec_notifier) { > - ret = -ENOMEM; > - goto err_iahb; > - } > - > /* > * To prevent overflows in HDMI_IH_FC_STAT2, set the clk regenerator > * N and cts values before enabling phy > @@ -2796,9 +2817,6 @@ __dw_hdmi_probe(struct platform_device *pdev, > hdmi->ddc = NULL; > } > > - if (hdmi->cec_notifier) > - cec_notifier_put(hdmi->cec_notifier); > - > clk_disable_unprepare(hdmi->iahb_clk); > if (hdmi->cec_clk) > clk_disable_unprepare(hdmi->cec_clk); > @@ -2820,9 +2838,6 @@ static void __dw_hdmi_remove(struct dw_hdmi *hdmi) > /* Disable all interrupts */ > hdmi_writeb(hdmi, ~0, HDMI_IH_MUTE_PHY_STAT0); > > - if (hdmi->cec_notifier) > - cec_notifier_put(hdmi->cec_notifier); > - > clk_disable_unprepare(hdmi->iahb_clk); > clk_disable_unprepare(hdmi->isfr_clk); > if (hdmi->cec_clk) >