From patchwork Fri Jan 15 11:02:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 363547 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp184621jap; Fri, 15 Jan 2021 03:04:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxfQ9r17u6IhiQb4RzKdtl595xOiBYdYR6/IfOSiOV1uSPS/ls9wKqYFt4g6/XIVwUTAykk X-Received: by 2002:a50:d5c1:: with SMTP id g1mr9422118edj.299.1610708670057; Fri, 15 Jan 2021 03:04:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610708670; cv=none; d=google.com; s=arc-20160816; b=ZHdeQrXFJV9SgKSgLk8jYw1fs08GOV4tujhpIejcTo0GPJ5f32BTYps+AhPvgCO6HM 8vguJt6PPH6hPCMXvwAMdaHXapp7lNJLBV/ZJlmAh6470e2R5AN2CDFJjq+K8L4KMbSN ArXbq5NaFovT2dt7e1pKAHkYizZOHuW5BHmn1g2nGdPv3C3P7TUcSWavx6ZQWW4l+Hfh 0G0q3+rtKM4qc/VHyXXo4Q0x/Op3+TDlPGrVJe+sLFCFdac18FaTv6ASx44RYoVQvEg7 UDev/+GH86K+7e3QiA52sI2lckk408CxiKqzwAQ5Cd7y0A6+AdfvKxsgMzvfHnmg1+Qc SrxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bVcjRs+Ok7w3SNArmcDX5s4jqseIUriYsAY++usO/v4=; b=E2EYBFCK11uWZgJeHstmdxbvpAK+OHtJLXmUShBx+zLAWtQsi1DfCIHuvetJtHpJdy V4a0yM4zJEcUjpA3j6GFrEtiv5FJRxn2U2OGSay3Sb0u+/LgR/cbvdiQo/4e85ExYJQo 76j+WowCdusQ/5ZR81M2KUnC00ixqH8zK+zxYpbVftMN/itFwR/x8wwvBEwzoaKj7gje zn0+ugWSvjK4r5ogd4w9hIXXzKvgzXAA1f5Q/sEf+ENYSOr/Nm7in9VcwXhgpn2K1f+U 5HJceZuvYPrvfqypCcVS4UdDkWkORBVmBr58kXxOaeTkuSsgDBSVmuqx27K+/hSvmL7B Et5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fIxlssTj; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m10si3877144eda.139.2021.01.15.03.04.29; Fri, 15 Jan 2021 03:04:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fIxlssTj; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726727AbhAOLDR (ORCPT + 15 others); Fri, 15 Jan 2021 06:03:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726045AbhAOLDQ (ORCPT ); Fri, 15 Jan 2021 06:03:16 -0500 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BF6FC061793 for ; Fri, 15 Jan 2021 03:02:36 -0800 (PST) Received: by mail-lj1-x231.google.com with SMTP id u11so9882022ljo.13 for ; Fri, 15 Jan 2021 03:02:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bVcjRs+Ok7w3SNArmcDX5s4jqseIUriYsAY++usO/v4=; b=fIxlssTjF9bpwqr0geCcR+J3tdYEWhq7wPNyJHJbQiSukYyUEqXPwA9D0TkaDkzxMA zG4lXbdrCx5FT9VSkj2NGhulPDcPyq8fUrXdmTi4VkmvR7UHnuj3rklnQsZE7YYlH6zS cSGJZhD72bBP1DXw12/+s1gAJMnHBdUMme0fyiQG+f3iYu+BPZar4Okhl172YtCc/sFy iczY+MN9pFkpLtNSojxEmFzTIyu46LfHwNLEszbKsNjqIrIyoE0LP/PjItp0vsJ+VC5T GVWib6T2i+uqQacta7ngU6eXf3W2uas4ZXMzy0dC2p4TMs7PlC0evbUip1FWLVqSWn6U CA8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bVcjRs+Ok7w3SNArmcDX5s4jqseIUriYsAY++usO/v4=; b=ZVgboNuRCEA4bqEL9uXJ7eCxIsSuvFMSvpM9RTi03z6+s2IMnFHyswg31yVPdEQB2l K9bFpaE7ttzSvVAbDypbUDkFH39khFduGLisLdnVqzi/Oriyr/M4sCqOw08/p3XD3gfB Aj25AaQnctUwpA1hQYtSPAg+emVfzJqMR5cEJ/on47YSBky/mBu1ZqScdO33rWWvVA63 cogze8tCvbfj1qYi19kjdGIMR1HtLyNk1ICOfYreo7inJ5MyaTbECqMoDGOmCHBJdCPn vM12gLUYq5dXn6qibgOJ3kxsT4tjjFSrzW7ng6CCfXw7zjbHI1k/lBiC3nAkDVE9+MkS 8Z8Q== X-Gm-Message-State: AOAM5320ZjJH86BLrXNQwi8fdh9NurzAHo9Sk8yTLcB8GHRbd9FoIIeg tDSnzyx4az662Ipyn/k991V2mQ== X-Received: by 2002:a05:651c:228:: with SMTP id z8mr5408367ljn.310.1610708554557; Fri, 15 Jan 2021 03:02:34 -0800 (PST) Received: from eriador.lumag.spb.ru ([188.162.64.106]) by smtp.gmail.com with ESMTPSA id s8sm862020lfi.21.2021.01.15.03.02.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 03:02:33 -0800 (PST) From: Dmitry Baryshkov To: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Cc: Daniel Vetter , David Airlie , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Vinod Koul , Sam Ravnborg , Manivannan Sadhasivam , Bjorn Andersson Subject: [PATCH v2 3/3] drm/bridge/lontium-lt9611uxc: move HPD notification out of IRQ handler Date: Fri, 15 Jan 2021 14:02:25 +0300 Message-Id: <20210115110225.127075-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210115110225.127075-1-dmitry.baryshkov@linaro.org> References: <20210115110225.127075-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org drm hotplug handling code (drm_client_dev_hotplug()) can wait on mutex, thus delaying further lt9611uxc IRQ events processing. It was observed occasionally during bootups, when drm_client_modeset_probe() was waiting for EDID ready event, which was delayed because IRQ handler was stuck trying to deliver hotplug event. Move hotplug notifications from IRQ handler to separate work to be able to process IRQ events without delays. Signed-off-by: Dmitry Baryshkov Fixes: 0cbbd5b1a012 ("drm: bridge: add support for lontium LT9611UXC bridge") Reviewed-by: Bjorn Andersson --- drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 30 +++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) -- 2.29.2 Reported-by: kernel test robot Reported-by: kernel test robot diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c index b708700e182d..88630bc2921f 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c @@ -14,6 +14,7 @@ #include #include #include +#include #include @@ -36,6 +37,7 @@ struct lt9611uxc { struct mutex ocm_lock; struct wait_queue_head wq; + struct work_struct work; struct device_node *dsi0_node; struct device_node *dsi1_node; @@ -52,6 +54,7 @@ struct lt9611uxc { bool hpd_supported; bool edid_read; + bool hdmi_connected; uint8_t fw_version; }; @@ -151,15 +154,26 @@ static irqreturn_t lt9611uxc_irq_thread_handler(int irq, void *dev_id) } if (irq_status & BIT(1)) { - if (lt9611uxc->connector.dev) - drm_kms_helper_hotplug_event(lt9611uxc->connector.dev); - else - drm_bridge_hpd_notify(<9611uxc->bridge, !!(hpd_status & BIT(1))); + lt9611uxc->hdmi_connected = !!(hpd_status & BIT(1)); + schedule_work(<9611uxc->work); } return IRQ_HANDLED; } +void lt9611uxc_hpd_work(struct work_struct *work) +{ + struct lt9611uxc *lt9611uxc = container_of(work, struct lt9611uxc, work); + + if (lt9611uxc->connector.dev) + drm_kms_helper_hotplug_event(lt9611uxc->connector.dev); + else + drm_bridge_hpd_notify(<9611uxc->bridge, + lt9611uxc->hdmi_connected ? + connector_status_connected : + connector_status_disconnected); +} + static void lt9611uxc_reset(struct lt9611uxc *lt9611uxc) { gpiod_set_value_cansleep(lt9611uxc->reset_gpio, 1); @@ -447,7 +461,7 @@ static enum drm_connector_status lt9611uxc_bridge_detect(struct drm_bridge *brid struct lt9611uxc *lt9611uxc = bridge_to_lt9611uxc(bridge); unsigned int reg_val = 0; int ret; - int connected = 1; + bool connected = true; if (lt9611uxc->hpd_supported) { lt9611uxc_lock(lt9611uxc); @@ -457,8 +471,9 @@ static enum drm_connector_status lt9611uxc_bridge_detect(struct drm_bridge *brid if (ret) dev_err(lt9611uxc->dev, "failed to read hpd status: %d\n", ret); else - connected = reg_val & BIT(1); + connected = !!(reg_val & BIT(1)); } + lt9611uxc->hdmi_connected = connected; return connected ? connector_status_connected : connector_status_disconnected; @@ -931,6 +946,8 @@ static int lt9611uxc_probe(struct i2c_client *client, lt9611uxc->fw_version = ret; init_waitqueue_head(<9611uxc->wq); + INIT_WORK(<9611uxc->work, lt9611uxc_hpd_work); + ret = devm_request_threaded_irq(dev, client->irq, NULL, lt9611uxc_irq_thread_handler, IRQF_ONESHOT, "lt9611uxc", lt9611uxc); @@ -967,6 +984,7 @@ static int lt9611uxc_remove(struct i2c_client *client) struct lt9611uxc *lt9611uxc = i2c_get_clientdata(client); disable_irq(client->irq); + flush_scheduled_work(); lt9611uxc_audio_exit(lt9611uxc); drm_bridge_remove(<9611uxc->bridge);