From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F44E3D6CC1 for ; Tue, 19 May 2026 07:30:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779175835; cv=none; b=R96fQFBSR/ZSzkyjM/iBIdw7vMbd3cz+P07Zg3yrEpFnEmeyfobU/T4J4Mj5OYpHQAs9O4bLC/p2woVXVLBVmfSBEN4KNb4u2OqiipOeunyKDQQr6twER4TgvHQWFa3pYgiBDmIbRKeCQ5u3fTrn0odtAgawE34GuiG/PSbINQA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779175835; c=relaxed/simple; bh=s7ItmozPyZEhRAAK1MCqPIiPUrXEONy5xfM5+BTe40k=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=UDWoWohrqfOpXN+kHBe4n4pP4hLPix0ZidLKCwEHF93Gs/PUdZgF3YoFFRfaX3N4rL5ACsaIMIYYO5IRyXixoQwdXMYZCBXTtoc/HKQnV3ktWFMYVvmBASHRJzs2wzT2wWBlk3Py+ost/oYRc5591NLl6wdM621SWYVnUDiVJLk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=cfvI9Y40; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="cfvI9Y40" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4896c22fcbaso26839445e9.0 for ; Tue, 19 May 2026 00:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779175831; x=1779780631; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=gHs1pX0u3NNghxESRV2f8uVEQJJT3wKuX92QnXmS80Q=; b=cfvI9Y401u31kl3iO/10W8oPrXYkxuKkHFNZUw8acnkt4EEaPJa8IsI6arUlg5dIG8 HbBYf5MH1L8gyJghRRW43qgOU42YDRqwxiO9YuwAb1cm/7H1rx86Wd4B8+ZSzUOYoG2W xztN8laCbZEcqqrcMgHyvLoLeQ94P/SROtV01/2ApHI3Y+CfPzK+R6gxpvGzLFA4tfxs D/CqJibB4eT5MyzplQBnIAyh0PsidJHvMXsi/Qp5f/Ms2B8k9id1mMB+Mdu5E+SU1r3P I5Y0Z5QNJKv8THJPF3stuwyiy1YN1kwsMTWISFlsohykUz5m67m44x2eecfs9Xo8mZhY zlGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779175831; x=1779780631; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gHs1pX0u3NNghxESRV2f8uVEQJJT3wKuX92QnXmS80Q=; b=oypJmZv5XKj9vtli5r5cVj8fQ4d+4kWtzx4sTv1D0N9bkCOaLn4xhs1dFUWPQejJjB ryEh5xjK1B3xwa7tgJWXUEYXoHaAiIlTbM7vd9bPHIKi9n5VjogNnTC+hwrojtKSB0vU kkyNIKtFKRngAIflO/yxGCgxV8YklmV3I7Pqfg7DAOjje+E8k7sM6WZofr3wOVSYRjZy c0VIQtKFqHCk36WPlZfdFe1Ja6RjhUJZQHwASGOMWjfB9xCdJJRiMwNrrJ001QaYsNRI h4+PBulMeI67P/nF9AqQytCleybRJcGEWudnGxd8nixtDli/BfC2nLtpuXW21S5OHOCp /HNA== X-Forwarded-Encrypted: i=1; AFNElJ/bP1WHAu4e444FsgnvM0+bmRZk9t2+5qp8wtrvVS4BHdt9HzHffwyti/aMfhGz4G/vDcXmyeLOTnzBBro=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9B4xGu3VPJiEUGvu/TDSWNmfhMMUxBllEVFEcp0qkDJOAltCd Zb02a9gm6CPnRS87Bqq7N16v27dSIfgIsQ7gr47JMnwtikv9SoWTfCYy8dOIRx4sEnU= X-Gm-Gg: Acq92OESjIqV2CZv15fFvpwTTt+gv8KnReW2A1MZHy6yaY6AHiODh3q4IekRoNjlSJi mIuXshgjj3LhIFJRZQkN43VlXZN7H46Uss0FYwBITywUB2T4+20j8ZkqRnt2A+Lny5tQt0U/3eT 5jYvELE8XDzF+aTVHIGJoKVOC4WETa8weWTNZf9YiV9JtrLguOj2jKW5NUuhMY4brq68zkMJsJD NPNvXaNW17c6EA+HyC9MmObZhMwW2Kv9cMh/Oy6bj9+/k9WLKViQ5OOHp1yCNjGT0jXkrlA9EdE 0g/utkxrt0WB/x/zLoaxpXextEXG73JxttUziRfJj+p2yuhScWMP3uM6K4K5oB58B/agRO9F4sb XkSAT3MmVKE6jn7x1OV9MoK2SnJe/Gc/k41HPstEi+tKKXnRFMqXsJxpTOTdHwsq0GRPOLC8TxR wfNnBgWTcPNvEZNnK24KQUiX/hINz3Uawj5sxr+vK0O8do8qpG+7Ip3dlW4AJ/il0n+tbu2u06o QvEOXrZYDpivrE= X-Received: by 2002:a05:600c:350b:b0:48a:58ae:9938 with SMTP id 5b1f17b1804b1-48ff3346102mr208556935e9.19.1779175831272; Tue, 19 May 2026 00:30:31 -0700 (PDT) Received: from ?IPV6:2a01:e0a:106d:1080:1d4b:274c:94d:a69f? ([2a01:e0a:106d:1080:1d4b:274c:94d:a69f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48feaf0fb46sm100860345e9.11.2026.05.19.00.30.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 May 2026 00:30:30 -0700 (PDT) Message-ID: <78f3211e-cdb8-4f76-a311-d4d66fc68d3d@linaro.org> Date: Tue, 19 May 2026 09:30:30 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Neil Armstrong Reply-To: Neil Armstrong Subject: Re: [PATCH 06/13] drm/meson: encoder_hdmi: Use bridge connector CEC notifier To: Jonas Karlman , Kevin Hilman , Heiko Stuebner , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jerome Brunet , Martin Blumenstingl Cc: dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org References: <20260518194744.2483580-1-jonas@kwiboo.se> <20260518194744.2483580-7-jonas@kwiboo.se> Content-Language: en-US, fr Autocrypt: addr=neil.armstrong@linaro.org; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04 YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+ SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g Organization: Linaro In-Reply-To: <20260518194744.2483580-7-jonas@kwiboo.se> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/18/26 21:47, Jonas Karlman wrote: > The dw-hdmi bridge detect() func now updates EDID and CEC phys addr for > the connector and any registered generic CEC notifier. > > Replace the open-coded CEC notifier handling with use of the bridge CEC > notifier op. > > Signed-off-by: Jonas Karlman > --- > drivers/gpu/drm/meson/Kconfig | 1 + > drivers/gpu/drm/meson/meson_encoder_hdmi.c | 85 +++++----------------- > 2 files changed, 19 insertions(+), 67 deletions(-) > > diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig > index 417f79829cf8..0dc5ca21e4fc 100644 > --- a/drivers/gpu/drm/meson/Kconfig > +++ b/drivers/gpu/drm/meson/Kconfig > @@ -13,6 +13,7 @@ config DRM_MESON > select REGMAP_MMIO > select MESON_CANVAS > select CEC_CORE if CEC_NOTIFIER > + select DRM_DISPLAY_HDMI_CEC_NOTIFIER_HELPER if CEC_NOTIFIER > > config DRM_MESON_DW_HDMI > tristate "HDMI Synopsys Controller support for Amlogic Meson Display" > diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c > index 1b9a1d9ed3d3..45104ef35344 100644 > --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c > +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c > @@ -16,8 +16,6 @@ > #include > #include > > -#include > - > #include > #include > #include > @@ -41,7 +39,6 @@ struct meson_encoder_hdmi { > struct drm_connector *connector; > struct meson_drm *priv; > unsigned long output_bus_fmt; > - struct cec_notifier *cec_notifier; > }; > > #define bridge_to_meson_encoder_hdmi(x) \ > @@ -57,14 +54,6 @@ static int meson_encoder_hdmi_attach(struct drm_bridge *bridge, > &encoder_hdmi->bridge, flags); > } > > -static void meson_encoder_hdmi_detach(struct drm_bridge *bridge) > -{ > - struct meson_encoder_hdmi *encoder_hdmi = bridge_to_meson_encoder_hdmi(bridge); > - > - cec_notifier_conn_unregister(encoder_hdmi->cec_notifier); > - encoder_hdmi->cec_notifier = NULL; > -} > - > static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, > const struct drm_display_mode *mode) > { > @@ -321,27 +310,9 @@ static int meson_encoder_hdmi_atomic_check(struct drm_bridge *bridge, > return 0; > } > > -static void meson_encoder_hdmi_hpd_notify(struct drm_bridge *bridge, > - struct drm_connector *connector, > - enum drm_connector_status status) > -{ > - struct meson_encoder_hdmi *encoder_hdmi = bridge_to_meson_encoder_hdmi(bridge); > - > - if (!encoder_hdmi->cec_notifier) > - return; > - > - if (status == connector_status_connected) > - cec_notifier_set_phys_addr(encoder_hdmi->cec_notifier, > - connector->display_info.source_physical_address); > - else > - cec_notifier_phys_addr_invalidate(encoder_hdmi->cec_notifier); > -} > - > static const struct drm_bridge_funcs meson_encoder_hdmi_bridge_funcs = { > .attach = meson_encoder_hdmi_attach, > - .detach = meson_encoder_hdmi_detach, > .mode_valid = meson_encoder_hdmi_mode_valid, > - .hpd_notify = meson_encoder_hdmi_hpd_notify, > .atomic_enable = meson_encoder_hdmi_atomic_enable, > .atomic_disable = meson_encoder_hdmi_atomic_disable, > .atomic_get_input_bus_fmts = meson_encoder_hdmi_get_inp_bus_fmts, > @@ -374,9 +345,9 @@ int meson_encoder_hdmi_probe(struct meson_drm *priv) > > meson_encoder_hdmi->bridge.next_bridge = of_drm_find_and_get_bridge(remote); > if (!meson_encoder_hdmi->bridge.next_bridge) { > - ret = dev_err_probe(priv->dev, -EPROBE_DEFER, > - "Failed to find HDMI transceiver bridge\n"); > - goto err_put_node; > + of_node_put(remote); > + return dev_err_probe(priv->dev, -EPROBE_DEFER, > + "Failed to find HDMI transceiver bridge\n"); > } > > /* HDMI Encoder Bridge */ > @@ -384,6 +355,13 @@ int meson_encoder_hdmi_probe(struct meson_drm *priv) > meson_encoder_hdmi->bridge.type = DRM_MODE_CONNECTOR_HDMIA; > meson_encoder_hdmi->bridge.interlace_allowed = true; > > + pdev = of_find_device_by_node(remote); > + of_node_put(remote); > + if (pdev) { > + meson_encoder_hdmi->bridge.ops |= DRM_BRIDGE_OP_HDMI_CEC_NOTIFIER; > + meson_encoder_hdmi->bridge.hdmi_cec_dev = &pdev->dev; > + } > + > drm_bridge_add(&meson_encoder_hdmi->bridge); > > meson_encoder_hdmi->priv = priv; > @@ -391,30 +369,24 @@ int meson_encoder_hdmi_probe(struct meson_drm *priv) > /* Encoder */ > ret = drm_simple_encoder_init(priv->drm, &meson_encoder_hdmi->encoder, > DRM_MODE_ENCODER_TMDS); > - if (ret) { > - dev_err_probe(priv->dev, ret, "Failed to init HDMI encoder\n"); > - goto err_put_node; > - } > + if (ret) > + return dev_err_probe(priv->dev, ret, "Failed to init HDMI encoder\n"); > > meson_encoder_hdmi->encoder.possible_crtcs = BIT(0); > > /* Attach HDMI Encoder Bridge to Encoder */ > ret = drm_bridge_attach(&meson_encoder_hdmi->encoder, &meson_encoder_hdmi->bridge, NULL, > DRM_BRIDGE_ATTACH_NO_CONNECTOR); > - if (ret) { > - dev_err_probe(priv->dev, ret, "Failed to attach bridge\n"); > - goto err_put_node; > - } > + if (ret) > + return dev_err_probe(priv->dev, ret, "Failed to attach bridge\n"); > > /* Initialize & attach Bridge Connector */ > meson_encoder_hdmi->connector = drm_bridge_connector_init(priv->drm, > &meson_encoder_hdmi->encoder); > - if (IS_ERR(meson_encoder_hdmi->connector)) { > - ret = dev_err_probe(priv->dev, > - PTR_ERR(meson_encoder_hdmi->connector), > - "Unable to create HDMI bridge connector\n"); > - goto err_put_node; > - } > + if (IS_ERR(meson_encoder_hdmi->connector)) > + return dev_err_probe(priv->dev, > + PTR_ERR(meson_encoder_hdmi->connector), > + "Unable to create HDMI bridge connector\n"); > > /* > * We should have now in place: > @@ -437,32 +409,11 @@ int meson_encoder_hdmi_probe(struct meson_drm *priv) > /* Handle this here until handled by drm_bridge_connector_init() */ > meson_encoder_hdmi->connector->ycbcr_420_allowed = true; > > - pdev = of_find_device_by_node(remote); > - of_node_put(remote); > - if (pdev) { > - struct cec_connector_info conn_info; > - struct cec_notifier *notifier; > - > - cec_fill_conn_info_from_drm(&conn_info, meson_encoder_hdmi->connector); > - > - notifier = cec_notifier_conn_register(&pdev->dev, NULL, &conn_info); > - if (!notifier) { > - put_device(&pdev->dev); > - return -ENOMEM; > - } > - > - meson_encoder_hdmi->cec_notifier = notifier; > - } > - > priv->encoders[MESON_ENC_HDMI] = meson_encoder_hdmi; > > dev_dbg(priv->dev, "HDMI encoder initialized\n"); > > return 0; > - > -err_put_node: > - of_node_put(remote); > - return ret; > } > > void meson_encoder_hdmi_remove(struct meson_drm *priv) Reviewed-by: Neil Armstrong Thanks, Neil