From patchwork Thu Sep 22 23:21:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 12985930 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6D53FECAAD8 for ; Thu, 22 Sep 2022 23:21:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8AE7210E212; Thu, 22 Sep 2022 23:21:14 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by gabe.freedesktop.org (Postfix) with ESMTPS id 89C2310E792 for ; Thu, 22 Sep 2022 23:21:11 +0000 (UTC) Received: from notapiano.myfiosgateway.com (unknown [71.190.76.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nfraprado) by madras.collabora.co.uk (Postfix) with ESMTPSA id 535A2660221E; Fri, 23 Sep 2022 00:21:07 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1663888869; bh=6nP/9Zwgxo3QoKKRtWQ1NzQUJknZbxNLs8qAepYQ8Is=; h=From:To:Cc:Subject:Date:From; b=UkE+IPdZWxVIdnWhxNsSLoepa2mBtct2d8MQJCnMGxOxjAWPaHvBzUAotcsKhwu/B JaBL6bnpBF0H18XUhe3IVgNq/UiFn+Gz3Gwue9/4unRstYptP0JZDB+OibCg4sKmVz sRUxH8tExtkUkgAxwPpVbPP7FRQ8S5W85QgKd/NvpypE42kWOficRu9npH6yRjCcZ3 ZA4yjMnwjDsvtxhV6edVENMH8DeIznbXIye2EYS5dFJN1gaktpSkZu5v2C7ZVfqk8L KG7i0CFRKDrDuov2sQqYlQl4HUEUmufs0PxfJZSVJKJyUCw8MrdJhZ3yksNjmFFiD8 ZTJqmwdj5LcDg== From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= To: Robert Foss Subject: [PATCH] drm/bridge: anx7625: Notify audio framework of connector status changes Date: Thu, 22 Sep 2022 19:21:03 -0400 Message-Id: <20220922232103.246955-1-nfraprado@collabora.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Neil Armstrong , Andrzej Hajda , =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4g?= =?utf-8?b?UHJhZG8=?= , Jonas Karlman , David Airlie , Thomas Zimmermann , dri-devel@lists.freedesktop.org, Javier Martinez Canillas , Jernej Skrabec , linux-kernel@vger.kernel.org, Laurent Pinchart , Hsin-Yi Wang , Maxime Ripard , kernel@collabora.com, Xin Ji , AngeloGioacchino Del Regno Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We already have anx7625_audio_update_connector_status() to notify the audio framework when HDMI is (dis)connected, but up until now this function was only called during the callback setup. Add a call for it to the HPD change handling logic. A couple functions needed to be hoisted as part of this. Signed-off-by: Nícolas F. R. A. Prado --- drivers/gpu/drm/bridge/analogix/anx7625.c | 48 ++++++++++++----------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index b0ff1ecb80a5..da54d6a61e07 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -1588,6 +1588,29 @@ static int anx7625_hpd_change_detect(struct anx7625_data *ctx) return 0; } +static void +anx7625_audio_update_connector_status(struct anx7625_data *ctx, + enum drm_connector_status status) +{ + if (ctx->plugged_cb && ctx->codec_dev) { + ctx->plugged_cb(ctx->codec_dev, + status == connector_status_connected); + } +} + +static enum drm_connector_status anx7625_sink_detect(struct anx7625_data *ctx) +{ + struct device *dev = &ctx->client->dev; + + DRM_DEV_DEBUG_DRIVER(dev, "sink detect\n"); + + if (ctx->pdata.panel_bridge) + return connector_status_connected; + + return ctx->hpd_status ? connector_status_connected : + connector_status_disconnected; +} + static void anx7625_work_func(struct work_struct *work) { int event; @@ -1603,6 +1626,8 @@ static void anx7625_work_func(struct work_struct *work) if (event < 0) goto unlock; + anx7625_audio_update_connector_status(ctx, anx7625_sink_detect(ctx)); + if (ctx->bridge_attached) drm_helper_hpd_irq_event(ctx->bridge.dev); @@ -1790,19 +1815,6 @@ static struct edid *anx7625_get_edid(struct anx7625_data *ctx) return (struct edid *)edid; } -static enum drm_connector_status anx7625_sink_detect(struct anx7625_data *ctx) -{ - struct device *dev = &ctx->client->dev; - - DRM_DEV_DEBUG_DRIVER(dev, "sink detect\n"); - - if (ctx->pdata.panel_bridge) - return connector_status_connected; - - return ctx->hpd_status ? connector_status_connected : - connector_status_disconnected; -} - static int anx7625_audio_hw_params(struct device *dev, void *data, struct hdmi_codec_daifmt *fmt, struct hdmi_codec_params *params) @@ -1951,16 +1963,6 @@ static int anx7625_hdmi_i2s_get_dai_id(struct snd_soc_component *component, return 0; } -static void -anx7625_audio_update_connector_status(struct anx7625_data *ctx, - enum drm_connector_status status) -{ - if (ctx->plugged_cb && ctx->codec_dev) { - ctx->plugged_cb(ctx->codec_dev, - status == connector_status_connected); - } -} - static int anx7625_audio_hook_plugged_cb(struct device *dev, void *data, hdmi_codec_plugged_cb fn, struct device *codec_dev)