From nobody Fri Dec 19 21:13:50 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF33A33A6F8 for ; Wed, 3 Dec 2025 18:28:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764786536; cv=none; b=bpOvjrnZZzf+0pytsI5Yx/miIuF61bCoIqv4TiumONiY6fWraubk63k7VNrtds45YDxs0ZLR7MO/c5tEKOmMKIUzKCzR2ON42/pGuxvNYczvAJo2gfFkA+sOkR7o7bt/+taJ+WIUnw/KtcbjeITLQNID+Q4cQa1hyg6hhB6Q254= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764786536; c=relaxed/simple; bh=2+6Xuv5NuuLwx+dfcaxvrziXvdasxB7VsPYSJXJgRhQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=r99+aUXW/HsDD5dGVUfLVo5Q8Wxj/ZrXem9dcX7sFL0ZoLKdzXLD1EwpKYLyg8f75DnTdSb2Hv2PEiRknRM2PtyJswA2WcFY51mpj/rQ7wgPsvDE1u42wqH4bw6zi4ntxsaXfBFCeyd0aTdG9fQj/OoduiZuQzVlSobHAysXi8g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=PojGH2zN; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="PojGH2zN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1764786533; bh=2+6Xuv5NuuLwx+dfcaxvrziXvdasxB7VsPYSJXJgRhQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PojGH2zNAkDnnu7E7XkIzKwayyKi9AC/a3JT9br4GBgZDLNemT58fjjZPiyuOIabM gjnRxmTQS1EOqMqCv3zMByeGV6udwJ5Ext/GGtIxb43n/fRf6nrtjtLg+MKRVg9wkz 3RwyQvMD5po/CXld6ny4s5kcZli48mdvil5/boaBs1fGDb/6omD6dU5DZtk7owtuFV kKiRxY+yWkaen0jOATqGQ5dwRZ2tQkKw0i5zD2qa7bqOZc9XXLHFrCS7+8Qtm+ExEH 28eIckgR84SWbO05pTzleDxpT89A9MaTcPD+by3tQcC9NviXnnDiT6lgH6asjxGybJ Yye6CpjsdBM1g== Received: from localhost (unknown [82.79.138.145]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id F155C17E13F2; Wed, 3 Dec 2025 19:28:52 +0100 (CET) From: Cristian Ciocaltea Date: Wed, 03 Dec 2025 20:27:55 +0200 Subject: [PATCH 4/4] drm/rockchip: dw_hdmi_qp: Do not send HPD events for all connectors Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251203-dw-hdmi-qp-scramb-v1-4-836fe7401a69@collabora.com> References: <20251203-dw-hdmi-qp-scramb-v1-0-836fe7401a69@collabora.com> In-Reply-To: <20251203-dw-hdmi-qp-scramb-v1-0-836fe7401a69@collabora.com> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org X-Mailer: b4 0.14.3 In order to optimize the HPD event handling and run the detect cycle on the affected connector only, make use of drm_connector_helper_hpd_irq_event() instead of drm_helper_hpd_irq_event(). Additionally, move devm_request_threaded_irq() after bridge connector initialization. Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 44 ++++++++++++----------= ---- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/d= rm/rockchip/dw_hdmi_qp-rockchip.c index c9fe6aa3e3e3..a05f711f036a 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -92,6 +92,7 @@ struct rockchip_hdmi_qp { struct regmap *regmap; struct regmap *vo_regmap; struct rockchip_encoder encoder; + struct drm_connector *connector; struct dw_hdmi_qp *hdmi; struct phy *phy; struct gpio_desc *frl_enable_gpio; @@ -251,14 +252,10 @@ static void dw_hdmi_qp_rk3588_hpd_work(struct work_st= ruct *work) struct rockchip_hdmi_qp *hdmi =3D container_of(work, struct rockchip_hdmi_qp, hpd_work.work); - struct drm_device *drm =3D hdmi->encoder.encoder.dev; - bool changed; + bool changed =3D drm_connector_helper_hpd_irq_event(hdmi->connector); =20 - if (drm) { - changed =3D drm_helper_hpd_irq_event(drm); - if (changed) - dev_dbg(hdmi->dev, "connector status changed\n"); - } + if (changed) + dev_dbg(hdmi->dev, "connector status changed\n"); } =20 static irqreturn_t dw_hdmi_qp_rk3576_hardirq(int irq, void *dev_id) @@ -475,13 +472,12 @@ static int dw_hdmi_qp_rockchip_bind(struct device *de= v, struct device *master, struct dw_hdmi_qp_plat_data plat_data =3D {}; const struct rockchip_hdmi_qp_cfg *cfg; struct drm_device *drm =3D data; - struct drm_connector *connector; struct drm_encoder *encoder; struct rockchip_hdmi_qp *hdmi; struct resource *res; struct clk_bulk_data *clks; struct clk *ref_clk; - int ret, irq, i; + int ret, hpd_irq, i; =20 if (!pdev->dev.of_node) return -ENODEV; @@ -582,17 +578,9 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev= , struct device *master, if (plat_data.cec_irq < 0) return plat_data.cec_irq; =20 - irq =3D platform_get_irq_byname(pdev, "hpd"); - if (irq < 0) - return irq; - - ret =3D devm_request_threaded_irq(hdmi->dev, irq, - cfg->ctrl_ops->hardirq_callback, - cfg->ctrl_ops->irq_callback, - IRQF_SHARED, "dw-hdmi-qp-hpd", - hdmi); - if (ret) - return ret; + hpd_irq =3D platform_get_irq_byname(pdev, "hpd"); + if (hpd_irq < 0) + return hpd_irq; =20 drm_encoder_helper_add(encoder, &dw_hdmi_qp_rockchip_encoder_helper_funcs= ); drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS); @@ -606,12 +594,20 @@ static int dw_hdmi_qp_rockchip_bind(struct device *de= v, struct device *master, "Failed to bind dw-hdmi-qp"); } =20 - connector =3D drm_bridge_connector_init(drm, encoder); - if (IS_ERR(connector)) - return dev_err_probe(hdmi->dev, PTR_ERR(connector), + hdmi->connector =3D drm_bridge_connector_init(drm, encoder); + if (IS_ERR(hdmi->connector)) + return dev_err_probe(hdmi->dev, PTR_ERR(hdmi->connector), "Failed to init bridge connector\n"); =20 - return drm_connector_attach_encoder(connector, encoder); + ret =3D drm_connector_attach_encoder(hdmi->connector, encoder); + if (ret) + return ret; + + return devm_request_threaded_irq(hdmi->dev, hpd_irq, + cfg->ctrl_ops->hardirq_callback, + cfg->ctrl_ops->irq_callback, + IRQF_SHARED, "dw-hdmi-qp-hpd", + hdmi); } =20 static void dw_hdmi_qp_rockchip_unbind(struct device *dev, --=20 2.51.2