From patchwork Thu Jan 21 23:33:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 367882 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1001377jam; Thu, 21 Jan 2021 15:34:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJxmtdb+UaEemcC+nM/mFs2OwpVQ9u6n3YqqsT+AK2f0wi9wn3wLiG7uKLnJHWqDbG5k7EJA X-Received: by 2002:a17:906:aec1:: with SMTP id me1mr1292647ejb.114.1611272092734; Thu, 21 Jan 2021 15:34:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611272092; cv=none; d=google.com; s=arc-20160816; b=YhNEpplX5Qo/pYUuiC8wA7jBHllz2MxjKSKrkM0G3vjytgXqkbOcrSYbL6VrpLo+8R F7W0A4AT8Yh4DB0/NqYiKF3HG7d3OkamXTlkerDYArZ0Z0yiQzKvAw/B1oSXzP92F7ov U+xuCZZ1FFScZWKKEseJ7qpthE/eeOfc6gwMiOFpHncBNCYykozWLAl4GH6eq3dk8GCk 7zRMHUH3B7YmRFbMpwhzI7z8pMAiMv2IXcLSl0CCW3fo5hx1XDAlhbJaemLXdSwW0XM0 O7apbSnzaDBhPFRX+uBgnd7iBMFMSaa2nrrO8ICamgTTydiYJVl1gIWqg5vW3iMAiaa3 nesA== 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=nLR41DXLpX01EFGGqYnK9wGC2B/eZfRvF8CSAXF0+wM=; b=JjzPVSYlEps04cKjCWVijB8YAgf8nCU8nHswP0PULYxvYAChEQL4A5xGGVZ/8POpv7 PhSKSNLFVvFHBBcYsPaL3vCB6+OYRMmcPCxYUbLBOINmHoaLH99+pKmM9n8G1DNF1REl SXfPL3ZsZYC2oN4tLfCgaxAmBFS+PqsncegLmvumt/WkArJnOh/WOZ67b85qT4Skk+TO /o9uIZPKQ31h2zM08EyRdLqC81phceZL6iHqc3vq0z4tq8KPUL/WohSRW+Iimf/zBnV5 YpFjBwvBa8Ig1K43yMeOoZxxDpMe4F+/iewxUynOum97NkbsGt4KEpRKdoUw0VJjL/Zm rRzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uW5eW3TZ; 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 go33si2315156ejc.40.2021.01.21.15.34.52; Thu, 21 Jan 2021 15:34:52 -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=uW5eW3TZ; 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 S1725779AbhAUXeB (ORCPT + 15 others); Thu, 21 Jan 2021 18:34:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726202AbhAUXdu (ORCPT ); Thu, 21 Jan 2021 18:33:50 -0500 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47B49C0613D6 for ; Thu, 21 Jan 2021 15:33:10 -0800 (PST) Received: by mail-lj1-x22f.google.com with SMTP id f11so4466705ljm.8 for ; Thu, 21 Jan 2021 15:33:10 -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=nLR41DXLpX01EFGGqYnK9wGC2B/eZfRvF8CSAXF0+wM=; b=uW5eW3TZasEXRCDWT0TKkUuPWqXEULz2GdydhJeniRJoiM1zBePlAtNcnqi376CPhm gWC58dX5F0i+Vs0WgL2uoQFc416FPZKpX3cvmoq6j0O+biInsJYOfjCT9N6WVrJnjxoS 6onjhcbX0HZDdS3PsjiC1cUvSpoY5zyYIkt3QBYC6TrTTD5NwcfHJ+25qD7BBE6dtbED 1HYkhlHQiXPL1LaC1ZLBga9KzL7UO72SHgcynsqU/ZPyoyujvV9nFSQWz9uEQ6J2BIEX Cv10xXwNRVrXMetW0r8CtvnQDLWUe38sfIxvwxTLGep7Bk8WXnzxIs0K2xMIeLgXpA0+ ldwA== 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=nLR41DXLpX01EFGGqYnK9wGC2B/eZfRvF8CSAXF0+wM=; b=BS3LPC/B0yXqL9ZNn1iyhrNhnUvd1eekxwgQOO+PB+WdUzXdnDKLvmpNf1E330/Yx2 vjOAykNO7hj+TB9jWC+4gzpYQBFPsrXmKXCw09XEmDfEq9YmdpUq3kQJkenwVhdMXIU4 7CU9JoGz62k23jR1kB3HI5n+QFswanX/3ESIEyP7e8guQQQT5+pmL3/h92bdrT+QLvkT WeKlM/LSEsKdJk8RXsEn0A2MjlxI90FYffiq+4+ufuaje9tbFhxGxaf6opTmgMFceNCR /eHyJcYvxKugp0pROdUcBMEJYf1c7ox5rZ2tinFfGSGfa3+VKzkGMY7TbTybPuTjaPYa bGCg== X-Gm-Message-State: AOAM530Fm32wFEvyyEOqJZbb6G4jxpuGdsafQd+E72nKZG2Is7q4x5sA s4IZ4IWKRwILDHcLG7J6YIAMpQ== X-Received: by 2002:a2e:b4d1:: with SMTP id r17mr871501ljm.466.1611271988840; Thu, 21 Jan 2021 15:33:08 -0800 (PST) Received: from eriador.lan ([188.162.64.145]) by smtp.gmail.com with ESMTPSA id l28sm726969ljb.42.2021.01.21.15.33.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 15:33:08 -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 v4 1/3] drm/bridge/lontium-lt9611uxc: fix waiting for EDID to become available Date: Fri, 22 Jan 2021 02:33:01 +0300 Message-Id: <20210121233303.1221784-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121233303.1221784-1-dmitry.baryshkov@linaro.org> References: <20210121233303.1221784-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org - Call wake_up() when EDID ready event is received to wake wait_event_interruptible_timeout() - Increase waiting timeout, reading EDID can take longer than 100ms, so let's be on a safe side. 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.29.2 Reviewed-by: Andrzej Hajda diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c index 0c98d27f84ac..a59e811f1705 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c @@ -145,8 +145,10 @@ static irqreturn_t lt9611uxc_irq_thread_handler(int irq, void *dev_id) lt9611uxc_unlock(lt9611uxc); - if (irq_status & BIT(0)) + if (irq_status & BIT(0)) { lt9611uxc->edid_read = !!(hpd_status & BIT(0)); + wake_up_all(<9611uxc->wq); + } if (irq_status & BIT(1)) { if (lt9611uxc->connector.dev) @@ -465,7 +467,7 @@ static enum drm_connector_status lt9611uxc_bridge_detect(struct drm_bridge *brid static int lt9611uxc_wait_for_edid(struct lt9611uxc *lt9611uxc) { return wait_event_interruptible_timeout(lt9611uxc->wq, lt9611uxc->edid_read, - msecs_to_jiffies(100)); + msecs_to_jiffies(500)); } static int lt9611uxc_get_edid_block(void *data, u8 *buf, unsigned int block, size_t len) From patchwork Thu Jan 21 23:33:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 367883 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1001384jam; Thu, 21 Jan 2021 15:34:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJxUVR/0zvLPJJJBs2BuaCvcRe8s4HDnOtnb8JkfQWBCoBhGUS3fBWpg/aB50nQCZ5PfU/ve X-Received: by 2002:a50:d604:: with SMTP id x4mr1197041edi.64.1611272093134; Thu, 21 Jan 2021 15:34:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611272093; cv=none; d=google.com; s=arc-20160816; b=iEu2TkTYLix70j6gfZXE5Va4rtxYs3ylVUcgYcEe684IZd+ScDQJ6W/md+SIKELYlb 89Rs8z9QqXEgN8PfoI/F5YyYmaSKEXtgTC3bld3zDUR9AHDrCCIBQXyZogkv+oLDqlFI 9yXjSo8VNlRK6+2bSVIwZOnApPbLiNIcMOB5tP/SNSlgDNYgNjDVvKnt6OEYPDRaFnDr LWto0BxAuL7gSpf3F8W4Q8tcjdk0HyY0bqZcZUPa3Tnh7WqYAAfcxQuqy261lB2lIEwb GqlDvd25FN9b3DBXeaJbXZZWnoMmOGKvnEcg0oPCf6MjUh2mK01QqMT4vvu2H5U/LJAz MQtw== 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=LXLBko8Cp1/+g8qjMNN3MI6diNB1wKaGBp6QZagrUvw=; b=UPGBwTccfd82LbbwT9zfW2aDBveKuqxJCO6/vrn5NFrV64WetXb/4g91PIT8Nb/z5k XGSGq3MSfijuRZv8xKOWVi4TvvBZytvNVORzIC85vfj1r4ZmYjKoLj3h52flR6CrAClE Xbhe7kKlc9S79uUp9wDRcj/P9xrhm9dlaKWWRTXRQjoarx0EN67h8Ehey73zUGswg5aF hf+Hz6ZWq2uaNvPBT2ZLMSB47bs1vHsy2BvN2FZYSa/zaAujCNBUXUe+GZfc2eh7a4AV IurYcIYHJJ0nH/bzrEPZZEyvMOFPWSQl3qmwjN6JvmfZrg4nXQRsMuwceGY8wCICJapl lwMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H6plmw40; 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 go33si2315156ejc.40.2021.01.21.15.34.52; Thu, 21 Jan 2021 15:34:53 -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=H6plmw40; 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 S1725956AbhAUXeP (ORCPT + 15 others); Thu, 21 Jan 2021 18:34:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725950AbhAUXdz (ORCPT ); Thu, 21 Jan 2021 18:33:55 -0500 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07592C0613ED for ; Thu, 21 Jan 2021 15:33:12 -0800 (PST) Received: by mail-lf1-x12b.google.com with SMTP id b26so5006470lff.9 for ; Thu, 21 Jan 2021 15:33:11 -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=LXLBko8Cp1/+g8qjMNN3MI6diNB1wKaGBp6QZagrUvw=; b=H6plmw40MZ+6SjPcYq1mPJlnbzickRzJ8SRP54NDX47VY7L8rNmE3rpyVZsiOtXeKi z8mVBmZKjk3FRQqTig0hlWgLXB+S4m9KwqcsBQFHlecYLl/fzpMOt5hd5+uJCkGUzN28 NJjT2CRKFPXHy7KeJxw1z6m9Bw6kaUnSevl/j80O2LY78QPrVz4KmfcX0ITxZ9753THh UoY5p4VENRuytKHWiXDJE5+73P7l5GR+DwttXHxCxQW1dc4oqsKs0dZ0bb/ElL/NoHFT LaCKSPE2HphOcd00RiIwmP4YelSr5zNzSB16Ar7VilBQSBw+640Mchk4kTsD9qNSYdTn 3lkw== 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=LXLBko8Cp1/+g8qjMNN3MI6diNB1wKaGBp6QZagrUvw=; b=ucc5W0X0AwDlseS8fhEQ1HSjztinLOByOMXrgueoOFa5ZxSXGZYU9CYlA2471Y4GZI ZTzLKGcUEUdpp1KXyhK07tSmB4tn056kOnvtkOt4oedLC0f/uds5wfx2Ze3LhtB2QzF9 iA2KZDexxrjwUaunIgcvZGfRfGSzhkVY4GqTSfsKKc5di2uiIJZi4VpGwkpbr1UUwH08 Tt3bksdfXoq25C8mFB50Il1EhCEdXcg7JuJWpWshzrPsNAdS+kJmqQWpZPZLi7GtimSx UzHPME4cRpJldX1HLjxoa4+sbhIGqAAo6dJAcXhZTMPYHJcfVyUbRjky5soZA46q0smp DhOw== X-Gm-Message-State: AOAM533Av0362RlLDziAxovIY92dyXhjPVEWmzRFORkK7lrV1teB3EyQ tpsykLh2cbTS9i/nkuNYGpjPuw== X-Received: by 2002:a05:6512:612:: with SMTP id b18mr864962lfe.598.1611271990559; Thu, 21 Jan 2021 15:33:10 -0800 (PST) Received: from eriador.lan ([188.162.64.145]) by smtp.gmail.com with ESMTPSA id l28sm726969ljb.42.2021.01.21.15.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 15:33:09 -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 v4 2/3] drm/bridge/lontium-lt9611uxc: fix get_edid return code Date: Fri, 22 Jan 2021 02:33:02 +0300 Message-Id: <20210121233303.1221784-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121233303.1221784-1-dmitry.baryshkov@linaro.org> References: <20210121233303.1221784-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Return NULL pointer from get_edid() callback rather than ERR_PTR() pointer, as DRM code does NULL checks rather than IS_ERR(). Also while we are at it, return NULL if getting EDID timed out. 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.29.2 Reviewed-by: Andrzej Hajda diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c index a59e811f1705..b708700e182d 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c @@ -505,7 +505,10 @@ static struct edid *lt9611uxc_bridge_get_edid(struct drm_bridge *bridge, ret = lt9611uxc_wait_for_edid(lt9611uxc); if (ret < 0) { dev_err(lt9611uxc->dev, "wait for EDID failed: %d\n", ret); - return ERR_PTR(ret); + return NULL; + } else if (ret == 0) { + dev_err(lt9611uxc->dev, "wait for EDID timeout\n"); + return NULL; } return drm_do_get_edid(connector, lt9611uxc_get_edid_block, lt9611uxc); From patchwork Thu Jan 21 23:33:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 367884 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1001393jam; Thu, 21 Jan 2021 15:34:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwyNHOW/LLOYoBkH5eVw6zhRji9edzwZg2g/vEl9O78jVMguu9tgvUzB8kB90Cz2XyGlVTG X-Received: by 2002:a17:907:961c:: with SMTP id gb28mr1131079ejc.393.1611272093630; Thu, 21 Jan 2021 15:34:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611272093; cv=none; d=google.com; s=arc-20160816; b=K+RZ9iqAbhJOBGzOqaC8HJJmzFSo2Tl8wupUjdUuy3KNea7vPeydJop7OJRbV16UHr WCwk1db6GyWaGEp2Syjn2sPtBBEXfEm6qT/YJO6BkEzwmcVvxLu4k4ET3wt9WrS0/obR 6A3BKVC3KpQxGBpaCz1hJESNGYr3rt40bPYDhCnddIPZo3fq00GkoJLvZd/zzxIaMTD2 SZDThsxp88h0X/thWyMP2M5QRnwOy0pshh5B6sMzqC67UXRs48N1Pr4v2ZoCCL4qiPzo nr2oMPViCEN9kRr9MqTLHab6CZpBCwuKpqdIJwuXXDRwS1BKnN+oWu3W8uKjG8OCGkyA cc7A== 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=wshZlF4l3dM7/942tJe1PTLnIy8oQxHCkv+Yoccj52Y=; b=shyqo3jZXJnywpTRc53Zbyne86j02sNEGlsbfaCpM68UHEEeArYvr1rqDCagDLcMfJ oEw7KZNaqIpKniGaSUDSmcYWvQLMGim8btGYM2TMBgNbdcuy/G297Xl55fOPXj7rlEg/ l5FVrv84Tz8IaagHEYY2iVwJCtLtrbRlgDIrRJnDh9fGS92fuDCgNRXT3FmIiSj93TcB CW+O8d6wyxE+XSZB/l7vsdXVe8sF9wqMvyRNPDdwEqs6fFI+kILyDG/BPQ/yeZqEtbwI QfxsV1P8I+iwZif71hK2q+8TkZlYJ8YNhmep0KjmzgaoqwtnF0K+bo2PUIzNeFksOI5/ x/eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nK4+stLK; 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 go33si2315156ejc.40.2021.01.21.15.34.53; Thu, 21 Jan 2021 15:34:53 -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=nK4+stLK; 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 S1725950AbhAUXeS (ORCPT + 15 others); Thu, 21 Jan 2021 18:34:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725829AbhAUXeN (ORCPT ); Thu, 21 Jan 2021 18:34:13 -0500 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7A8BC061788 for ; Thu, 21 Jan 2021 15:33:13 -0800 (PST) Received: by mail-lf1-x135.google.com with SMTP id o13so5047831lfr.3 for ; Thu, 21 Jan 2021 15:33:13 -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=wshZlF4l3dM7/942tJe1PTLnIy8oQxHCkv+Yoccj52Y=; b=nK4+stLKBtiPG93FQAlIQTeFqc44W+FLadMxRM1AguYtbsR5d9suMyKsSUdbN6L0t7 Kcbtz1mkcrwy6NuH12mTrmSiRQzTCdntFIJFWmZrC3GvOOMk66cZQhvQlqccT/ufyMYc OVKo61QS7bmkh+DL0ydk/U2njoHUxc/vOiKmbct9jljywuJvTGrxunU0r4f0g8z8V6Px 9oXNWxZyBQtamk2KnUSv2uvWjLuSFrPcLYnJWEKAXd8mO6f8Aq4WZ06qjGbEEa1ja34O uXnF5qAFpbGD2PsvnVex7b3V0yIKVQKtx2n9fLfMtmNTMgB8VjUHWIeZiPipb5dGMd5c nfog== 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=wshZlF4l3dM7/942tJe1PTLnIy8oQxHCkv+Yoccj52Y=; b=MfKbBEt2diIQFryEVqro/CDdQZhyMiojAj3eJXEWy0qCXYZZikYkfRQgcB5EnEP3cR FlH8khYRWw3WNUPeKxDtUhyFHrAGL69Lh+AHZuonBxQUDImHxRow4lB8IrY1AEJrrW+W xW69OI+O6PNEk9qsLjcAUfftveQje2U/XD1WdlBmi2aijD0ZRUD0GD35lmC8aywa+gwJ QVrDZhiwjMIdfYLh89B3WWGH8AliBZxrXhI7h2zAOQiWcoq7Ltpkc9EkrRdSgdZLZWde NHqiFj7GDfTdRsV5LXU7RPjX+s3xS8Lwild77XlVlDNPmVusNQOdBRaFQk5vg9KEvc3t y/NQ== X-Gm-Message-State: AOAM531t+19T7zfHc4Q5JwybXaYVozNcmImfXRfXpahIviEGN6Nn91Fe 4xSpAbHqGPQT5XqLt+GCDqw+nPcxqmeL2xv2 X-Received: by 2002:a05:6512:131f:: with SMTP id x31mr842004lfu.552.1611271992194; Thu, 21 Jan 2021 15:33:12 -0800 (PST) Received: from eriador.lan ([188.162.64.145]) by smtp.gmail.com with ESMTPSA id l28sm726969ljb.42.2021.01.21.15.33.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 15:33:11 -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 Subject: [PATCH v4 3/3] drm/bridge/lontium-lt9611uxc: move HPD notification out of IRQ handler Date: Fri, 22 Jan 2021 02:33:03 +0300 Message-Id: <20210121233303.1221784-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121233303.1221784-1-dmitry.baryshkov@linaro.org> References: <20210121233303.1221784-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") --- drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 46 +++++++++++++++++----- 1 file changed, 37 insertions(+), 9 deletions(-) -- 2.29.2 diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c index b708700e182d..fee27952ec6d 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,8 @@ struct lt9611uxc { bool hpd_supported; bool edid_read; + /* can be accessed from different threads, so protect this with ocm_lock */ + bool hdmi_connected; uint8_t fw_version; }; @@ -143,23 +147,41 @@ static irqreturn_t lt9611uxc_irq_thread_handler(int irq, void *dev_id) if (irq_status) regmap_write(lt9611uxc->regmap, 0xb022, 0); - lt9611uxc_unlock(lt9611uxc); - if (irq_status & BIT(0)) { lt9611uxc->edid_read = !!(hpd_status & BIT(0)); wake_up_all(<9611uxc->wq); } 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); } + lt9611uxc_unlock(lt9611uxc); + return IRQ_HANDLED; } +static void lt9611uxc_hpd_work(struct work_struct *work) +{ + struct lt9611uxc *lt9611uxc = container_of(work, struct lt9611uxc, work); + bool connected; + + if (lt9611uxc->connector.dev) + drm_kms_helper_hotplug_event(lt9611uxc->connector.dev); + else { + + mutex_lock(<9611uxc->ocm_lock); + connected = lt9611uxc->hdmi_connected; + mutex_unlock(<9611uxc->ocm_lock); + + drm_bridge_hpd_notify(<9611uxc->bridge, + connected ? + connector_status_connected : + connector_status_disconnected); + } +} + static void lt9611uxc_reset(struct lt9611uxc *lt9611uxc) { gpiod_set_value_cansleep(lt9611uxc->reset_gpio, 1); @@ -447,18 +469,21 @@ 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; + + lt9611uxc_lock(lt9611uxc); if (lt9611uxc->hpd_supported) { - lt9611uxc_lock(lt9611uxc); ret = regmap_read(lt9611uxc->regmap, 0xb023, ®_val); - lt9611uxc_unlock(lt9611uxc); if (ret) dev_err(lt9611uxc->dev, "failed to read hpd status: %d\n", ret); else connected = reg_val & BIT(1); } + lt9611uxc->hdmi_connected = connected; + + lt9611uxc_unlock(lt9611uxc); return connected ? connector_status_connected : connector_status_disconnected; @@ -931,6 +956,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 +994,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);