From patchwork Tue Feb 8 04:43:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 540740 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp205011imo; Mon, 7 Feb 2022 20:41:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzURSMN2tl6sIAKfHX/XisxPL2VYa+rR7P5LOLWAsVy9qxmIq0JWuMZ49mvoaHk7vgwf65N X-Received: by 2002:a17:90b:314d:: with SMTP id ip13mr2208675pjb.42.1644295274876; Mon, 07 Feb 2022 20:41:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644295274; cv=none; d=google.com; s=arc-20160816; b=qeXV83cLm2ZhPzbBgbqxaH2g7RBKVzZz7wzZfLAlyFb016wJTORTV33X4mXE1OFnTD 8VqIcYP2N3m5/JJ+114WhFpAnOq+xLO4eyDlXaQzFwoxbSK2kpv9BePjpBvmda68wi9c Viwp/zQxut2LnaxFs5bAOCuZzLyk5ml5IG6POijNTZ03PC/thCzcaqGj9ymJUxmOkG69 p6Rbwba0qF0uTCUpY+n3/gcY/NoBgcWacCWGe/uZEDFvxJdFoM4/v8JXXXzufppJbaWq s/CPJoOJamuviM5xGg2F3j4t0ISQkR/ubsjybS7xI4FBlvQJmG1OzHqjcICuAwRby1x4 n2kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :delivered-to; bh=esjcw5J1950tYULEo1Mi5rlx0creI3trE/Z1yqFmq9U=; b=OJN7qtlBvY8KtrlXYuy/PyUa4qKHp+tCUQ7NZlaWCZnZ2cc35FQ+uRFlqbk4/1F0bU BOGl02EZT1JJELoY7ji2lCU01IkRMp3/mWSeNY3gak1WgiRVqvFcrOaeZU/PalPyq2c4 OwhozwXXd+n5qFhXSKIqHiplmjaem3e4mMO4v8johzSKmaZkcXD7xduAm7kZ/NFCJuhu RMbd0wRsZhdFTsoNIyqjjuVy0woiFCBlmqE6HOBocb3Yz+pgmg/szLw/TrsBSB3U0PpQ /UyWTHTqHNtPVHx0/azLSrU7OzuIHA1VJIhV66tJjkvKXwpx82Y3J3LpmCe5TxY3GjeO gmrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ip03ry5n; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id v202si526501pgb.677.2022.02.07.20.41.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 20:41:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ip03ry5n; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 306FC10E197; Tue, 8 Feb 2022 04:41:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ot1-x32b.google.com (mail-ot1-x32b.google.com [IPv6:2607:f8b0:4864:20::32b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2947D10E283 for ; Tue, 8 Feb 2022 04:41:10 +0000 (UTC) Received: by mail-ot1-x32b.google.com with SMTP id n6-20020a9d6f06000000b005a0750019a7so12442622otq.5 for ; Mon, 07 Feb 2022 20:41: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:mime-version :content-transfer-encoding; bh=esjcw5J1950tYULEo1Mi5rlx0creI3trE/Z1yqFmq9U=; b=ip03ry5nqNDMKLD/txk0cpnpGu1BvjmtduHQhiYMDZpn5vJRKhomQqMBgVAUV9p5PV 3xrn4cnCiRNPB/VaCfnqZhPnd6KJm6T6p/Qwoo2K8DYmR59WBKOjBe05u/COnPxqKiJu EqlHzDIxVCoDeopGi4kwr0th6q3BXHzubpSmeCksw9GLws5mb3eY4eRv5Z4+QKWjOS0Y KPeWUeFJFh6xDAyoWwt5pNIypf7EQ2wDAripNLU9/qsxjaW8t6yQrxYqf/j41O4nfDV+ Y+mDQYBT/pqa9wJDrE85riLOVO73QXylarUrOvwHg7M7L1Kpu8vh4YtdNTS7uY5knGR9 pv/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=esjcw5J1950tYULEo1Mi5rlx0creI3trE/Z1yqFmq9U=; b=GMw5K7fzA3mYJFVoQlJdVanZ8xzuRyAqHDSFKm21qoC9Ioi/7wNFNfoerJ+AB7ymS8 UdpbqmGIic6Xwkcm07QkJ6BDEMtHzZoqAdYJRaQFI5mO0s5qPH5ajOjMnjBlrfcLRMBi o3QBdoPxRW5x/6CdkcxKnKkh0Ff8dOocAblGfH1caC61402+C5m0XkmyXpLtIO5O1vKh uXBzcx+dJuTgAXI7NMf1ivPqewafL5FiZ+GZN12Ceq5mTlvtwYW7rJItnGp/KTeHLZst dV4BqEahxTRlt+NOrtqb5+Sx6HG5qrz021yvYb7taEaO1HVtG8RJp598I8O5jNfgsBqS ovjA== X-Gm-Message-State: AOAM530rumup5zw3ColSkpGhNiKSUHYUviHCmtVxiWwFif3BEQfBs+4g fDs9mbjEJIXnhS7bbzPjYRFbLA== X-Received: by 2002:a9d:2c28:: with SMTP id f37mr1162716otb.65.1644295269183; Mon, 07 Feb 2022 20:41:09 -0800 (PST) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id l14sm4709367ooq.12.2022.02.07.20.41.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 20:41:08 -0800 (PST) From: Bjorn Andersson To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Rob Clark , Dmitry Baryshkov Subject: [PATCH 1/2] drm: Add HPD state to drm_connector_oob_hotplug_event() Date: Mon, 7 Feb 2022 20:43:27 -0800 Message-Id: <20220208044328.588860-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.33.1 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: freedreno@lists.freedesktop.org, Heikki Krogerus , Thomas Zimmermann , David Airlie , Greg Kroah-Hartman , intel-gfx@lists.freedesktop.org, linux-usb@vger.kernel.org, Abhinav Kumar , Stephen Boyd , dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Sean Paul , linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" In some implementations, such as the Qualcomm platforms, the display driver has no way to query the current HPD state and as such it's impossible to distinguish between disconnect and attention events. Add a parameter to drm_connector_oob_hotplug_event() to pass the HPD state. Also push the test for unchanged state in the displayport altmode driver into the i915 driver, to allow other drivers to act upon each update. Signed-off-by: Bjorn Andersson --- Note that the Intel driver has only been compile tested with this patch. drivers/gpu/drm/drm_connector.c | 6 ++++-- drivers/gpu/drm/i915/display/intel_dp.c | 14 +++++++++++--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/usb/typec/altmodes/displayport.c | 9 ++------- include/drm/drm_connector.h | 5 +++-- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index a50c82bc2b2f..ad7295597c0f 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -2825,6 +2825,7 @@ struct drm_connector *drm_connector_find_by_fwnode(struct fwnode_handle *fwnode) /** * drm_connector_oob_hotplug_event - Report out-of-band hotplug event to connector * @connector_fwnode: fwnode_handle to report the event on + * @hpd_state: number of data lanes available * * On some hardware a hotplug event notification may come from outside the display * driver / device. An example of this is some USB Type-C setups where the hardware @@ -2834,7 +2835,8 @@ struct drm_connector *drm_connector_find_by_fwnode(struct fwnode_handle *fwnode) * This function can be used to report these out-of-band events after obtaining * a drm_connector reference through calling drm_connector_find_by_fwnode(). */ -void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode) +void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode, + bool hpd_state) { struct drm_connector *connector; @@ -2843,7 +2845,7 @@ void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode) return; if (connector->funcs->oob_hotplug_event) - connector->funcs->oob_hotplug_event(connector); + connector->funcs->oob_hotplug_event(connector, hpd_state); drm_connector_put(connector); } diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 146b83916005..00520867d37b 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4816,15 +4816,23 @@ static int intel_dp_connector_atomic_check(struct drm_connector *conn, return intel_modeset_synced_crtcs(state, conn); } -static void intel_dp_oob_hotplug_event(struct drm_connector *connector) +static void intel_dp_oob_hotplug_event(struct drm_connector *connector, bool hpd_state) { struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); struct drm_i915_private *i915 = to_i915(connector->dev); + bool need_work = false; spin_lock_irq(&i915->irq_lock); - i915->hotplug.event_bits |= BIT(encoder->hpd_pin); + if (hpd_state != i915->hotplug.oob_hotplug_state) { + i915->hotplug.event_bits |= BIT(encoder->hpd_pin); + + i915->hotplug.oob_hotplug_state = hpd_state; + need_work = true; + } spin_unlock_irq(&i915->irq_lock); - queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0); + + if (need_work) + queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0); } static const struct drm_connector_funcs intel_dp_connector_funcs = { diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 8c1706fd81f9..543ebf1cfcf4 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -149,6 +149,9 @@ struct i915_hotplug { /* Whether or not to count short HPD IRQs in HPD storms */ u8 hpd_short_storm_enabled; + /* Last state reported by oob_hotplug_event */ + bool oob_hotplug_state; + /* * if we get a HPD irq from DP and a HPD irq from non-DP * the non-DP HPD could block the workqueue on a mode config diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c index c1d8c23baa39..a4596be4d34a 100644 --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c @@ -59,7 +59,6 @@ struct dp_altmode { struct typec_displayport_data data; enum dp_state state; - bool hpd; struct mutex lock; /* device lock */ struct work_struct work; @@ -143,10 +142,7 @@ static int dp_altmode_status_update(struct dp_altmode *dp) if (!ret) dp->state = DP_STATE_CONFIGURE; } else { - if (dp->hpd != hpd) { - drm_connector_oob_hotplug_event(dp->connector_fwnode); - dp->hpd = hpd; - } + drm_connector_oob_hotplug_event(dp->connector_fwnode, hpd); } return ret; @@ -573,8 +569,7 @@ void dp_altmode_remove(struct typec_altmode *alt) cancel_work_sync(&dp->work); if (dp->connector_fwnode) { - if (dp->hpd) - drm_connector_oob_hotplug_event(dp->connector_fwnode); + drm_connector_oob_hotplug_event(dp->connector_fwnode, false); fwnode_handle_put(dp->connector_fwnode); } diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 64cf5f88c05b..7c90b8eb2ace 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1141,7 +1141,7 @@ struct drm_connector_funcs { * This will get called when a hotplug-event for a drm-connector * has been received from a source outside the display driver / device. */ - void (*oob_hotplug_event)(struct drm_connector *connector); + void (*oob_hotplug_event)(struct drm_connector *connector, bool hpd_state); }; /** @@ -1742,7 +1742,8 @@ drm_connector_is_unregistered(struct drm_connector *connector) DRM_CONNECTOR_UNREGISTERED; } -void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode); +void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode, + bool hpd_state); const char *drm_get_connector_type_name(unsigned int connector_type); const char *drm_get_connector_status_name(enum drm_connector_status status); const char *drm_get_subpixel_order_name(enum subpixel_order order); From patchwork Tue Feb 8 04:43:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 540741 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp205034imo; Mon, 7 Feb 2022 20:41:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzeOODt1SEgSh/rh1v8wvs+lxLHRqc/AXkGFzu6+mpSZlKjksWXeKJhkT6bft9FkQl+BOka X-Received: by 2002:a17:90b:1e05:: with SMTP id pg5mr2467269pjb.56.1644295278719; Mon, 07 Feb 2022 20:41:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644295278; cv=none; d=google.com; s=arc-20160816; b=TBFCvKOYFs5kINt/ThsSipnvhmD+GYKHjXobsxIPVN0YrV91Oijt+3lp2Prk9FEILC f8sBdueDj8E9BHlUDJHVeUCIiBPoi6V3+kaMKtvDOJ9Zcu47JWLI87IYR9Qt23FQInlv +5uhJdISfJ6OEXXgQYxFcsJmFaj1EsWaj6LYC3lLlGru3cYgWjjSWh8oxORJudsQdaDl FFlOvv+skYm/9ms0NiFXmCaMorGY8Ioom03EEFeaxG5n5SJyoCVd+o33pQNbFFDpL79y i+4Zm6dkhPryh9zY5mPg29FbP7CThE2hB0+1qZOVzEwZcDcsDDRYZYHfo/R2eCM4SmTZ STnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=lApkzQz97x0mjsEJc+j9OKw9zJ/S3b/963aKxsBJZWE=; b=mh94ue9bMbAYqVpTsBT9YUm3G/ZKbsPRrGjPMYsyCdV0OJYNdv2lsCIBBrpzaDbUKb YoPZFvQzqnIMybagBsUrNm7DO8FEonueGb0DyG195xl1E+FvhHy7f8M1OSTOfmOmoSR4 6K3VSCG7KWCyvRPnCBGIfC5nAi4IBkyuN66L9IBTciUUVOUeN5dZOlxRMfi9HFZEj2xC O2epizooaPmyZ3bxNg13aMPaXA+AMh8Mq4vOIS/ckxOfly4x1YQNHMD761Pc0L3CiqLE IVfASSqP4UU1p8dJTumGS/foqkH0e17LKCypgTVrTt10PeZFfOjHO48q4SnPWrI9hM8l zyKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UUESrc5s; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id z6si501808plg.174.2022.02.07.20.41.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 20:41:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UUESrc5s; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9725610E299; Tue, 8 Feb 2022 04:41:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4DA2010E299 for ; Tue, 8 Feb 2022 04:41:11 +0000 (UTC) Received: by mail-oi1-x22d.google.com with SMTP id r27so19374739oiw.4 for ; Mon, 07 Feb 2022 20:41: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=lApkzQz97x0mjsEJc+j9OKw9zJ/S3b/963aKxsBJZWE=; b=UUESrc5ssqMRmCaxq+U9GGNWZRYyVLIwHPaaKqw9Pq5DCbJZJzrBWe2w228S//BAbo 2GB+0MUYTqCnsYFQi1hf6ZtQMlH/QJc0GEMZmDY/jZ4H6WoYwAlRgMGtwaH/uiNSkgYg nTGk7Y4kToyMqYzcrPg5ag+Rs4oGaNIxLG27uDyUSHNijdf45grJX327yP6uyHRqb6hM yx0A5X7B8IqkjD10OlX+MM5KjmlxN/6dKndtfp5j1V6dbKlGUrNrIHN/hx07XuY1pJWz hIuTYXgDpaF5umFDhP0mmmWQq+aNcvBdCzjcWxT2+EgveGt3BiYjCIQ7Gzm4t0bHvB8P tlrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lApkzQz97x0mjsEJc+j9OKw9zJ/S3b/963aKxsBJZWE=; b=1HeC7ztIBeEu2AXCITE8PG9LX9asWl4anjLqL9ulHTLPRJT8Fa7yX05cXKmQTz1c97 JXcVMvAL1iAvxkkO4GlB0pdU0+/Leged5GuhYJiHhyclfikMiDjhAQMph8plTygx/N5U nXJa0FaNospb13sh88Iyz88AG+0b1TXEuxnPr1IpMc9jjPWpmTuEFnXHGjXQE0fUAFeC v/8lRN3PjuGA+tGkQxBHvIz8Cw6usghq2+FM5XX1XSteLyiva/XCZ6f9noGDamwiBw5a X+RbwOxdvd4vGUaGoSdEN8issCm0Jft2cWzmF8wOn6vFATcQ//zLl7csMH/4AvaWYJVz 8kMA== X-Gm-Message-State: AOAM530pNE1C8yF4w1qsBpd0s/K+yr8P18OO1TP83kilWIMougdJvOJ/ PBb3b3rSe/YIDmaFcmviHR6xhA== X-Received: by 2002:aca:ad97:: with SMTP id w145mr1029114oie.238.1644295270406; Mon, 07 Feb 2022 20:41:10 -0800 (PST) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id l14sm4709367ooq.12.2022.02.07.20.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 20:41:09 -0800 (PST) From: Bjorn Andersson To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Rob Clark , Dmitry Baryshkov Subject: [PATCH 2/2] drm/msm/dp: Implement oob_hotplug_event() Date: Mon, 7 Feb 2022 20:43:28 -0800 Message-Id: <20220208044328.588860-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220208044328.588860-1-bjorn.andersson@linaro.org> References: <20220208044328.588860-1-bjorn.andersson@linaro.org> 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: freedreno@lists.freedesktop.org, Heikki Krogerus , Thomas Zimmermann , David Airlie , Greg Kroah-Hartman , intel-gfx@lists.freedesktop.org, linux-usb@vger.kernel.org, Abhinav Kumar , Stephen Boyd , dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Sean Paul , linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The Qualcomm DisplayPort driver contains traces of the necessary plumbing to hook up USB HPD, in the form of the dp_hpd module and the dp_usbpd_cb struct. Use this as basis for implementing the oob_hotplug_event() callback, by amending the dp_hpd module with the missing logic. Overall the solution is similar to what's done downstream, but upstream all the code to disect the HPD notification lives on the calling side of drm_connector_oob_hotplug_event(). drm_connector_oob_hotplug_event() performs the lookup of the drm_connector based on fwnode, hence the need to assign the fwnode in dp_drm_connector_init(). Signed-off-by: Bjorn Andersson --- drivers/gpu/drm/msm/dp/dp_display.c | 8 ++++++++ drivers/gpu/drm/msm/dp/dp_display.h | 2 ++ drivers/gpu/drm/msm/dp/dp_drm.c | 10 ++++++++++ drivers/gpu/drm/msm/dp/dp_hpd.c | 19 +++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_hpd.h | 4 ++++ 5 files changed, 43 insertions(+) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 7cc4d21f2091..124a2f794382 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -414,6 +414,13 @@ static int dp_display_usbpd_configure_cb(struct device *dev) return dp_display_process_hpd_high(dp); } +void dp_display_oob_hotplug_event(struct msm_dp *dp_display, bool hpd_state) +{ + struct dp_display_private *dp = container_of(dp_display, struct dp_display_private, dp_display); + + dp->usbpd->oob_event(dp->usbpd, hpd_state); +} + static int dp_display_usbpd_disconnect_cb(struct device *dev) { struct dp_display_private *dp = dev_get_dp_display_private(dev); @@ -1251,6 +1258,7 @@ static int dp_display_probe(struct platform_device *pdev) dp->pdev = pdev; dp->name = "drm_dp"; dp->dp_display.connector_type = desc->connector_type; + dp->dp_display.dev = &pdev->dev; rc = dp_init_sub_modules(dp); if (rc) { diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h index e3adcd578a90..1f856b3bca79 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -11,6 +11,7 @@ #include "disp/msm_disp_snapshot.h" struct msm_dp { + struct device *dev; struct drm_device *drm_dev; struct device *codec_dev; struct drm_bridge *bridge; @@ -40,5 +41,6 @@ bool dp_display_check_video_test(struct msm_dp *dp_display); int dp_display_get_test_bpp(struct msm_dp *dp_display); void dp_display_signal_audio_start(struct msm_dp *dp_display); void dp_display_signal_audio_complete(struct msm_dp *dp_display); +void dp_display_oob_hotplug_event(struct msm_dp *dp_display, bool hpd_state); #endif /* _DP_DISPLAY_H_ */ diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c index d4d360d19eba..665568197c49 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -123,6 +123,13 @@ static enum drm_mode_status dp_connector_mode_valid( return dp_display_validate_mode(dp_disp, mode->clock); } +static void dp_oob_hotplug_event(struct drm_connector *connector, bool hpd_state) +{ + struct msm_dp *dp_disp = to_dp_connector(connector)->dp_display; + + dp_display_oob_hotplug_event(dp_disp, hpd_state); +} + static const struct drm_connector_funcs dp_connector_funcs = { .detect = dp_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, @@ -130,6 +137,7 @@ static const struct drm_connector_funcs dp_connector_funcs = { .reset = drm_atomic_helper_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, + .oob_hotplug_event = dp_oob_hotplug_event, }; static const struct drm_connector_helper_funcs dp_connector_helper_funcs = { @@ -160,6 +168,8 @@ struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display) if (ret) return ERR_PTR(ret); + connector->fwnode = fwnode_handle_get(dev_fwnode(dp_display->dev)); + drm_connector_helper_add(connector, &dp_connector_helper_funcs); /* diff --git a/drivers/gpu/drm/msm/dp/dp_hpd.c b/drivers/gpu/drm/msm/dp/dp_hpd.c index db98a1d431eb..3e62852a18b4 100644 --- a/drivers/gpu/drm/msm/dp/dp_hpd.c +++ b/drivers/gpu/drm/msm/dp/dp_hpd.c @@ -7,6 +7,7 @@ #include #include +#include #include "dp_hpd.h" @@ -45,6 +46,23 @@ int dp_hpd_connect(struct dp_usbpd *dp_usbpd, bool hpd) return rc; } +static void dp_hpd_oob_event(struct dp_usbpd *dp_usbpd, bool hpd_state) +{ + struct dp_hpd_private *hpd_priv = container_of(dp_usbpd, struct dp_hpd_private, dp_usbpd); + + DRM_DEBUG_DP("hpd_state: %d connected: %d\n", hpd_state, dp_usbpd->connected); + + if (!dp_usbpd->connected && hpd_state) { + dp_usbpd->connected = true; + hpd_priv->dp_cb->configure(hpd_priv->dev); + } else if (!hpd_state) { + dp_usbpd->connected = false; + hpd_priv->dp_cb->disconnect(hpd_priv->dev); + } else { + hpd_priv->dp_cb->attention(hpd_priv->dev); + } +} + struct dp_usbpd *dp_hpd_get(struct device *dev, struct dp_usbpd_cb *cb) { struct dp_hpd_private *dp_hpd; @@ -62,6 +80,7 @@ struct dp_usbpd *dp_hpd_get(struct device *dev, struct dp_usbpd_cb *cb) dp_hpd->dp_cb = cb; dp_hpd->dp_usbpd.connect = dp_hpd_connect; + dp_hpd->dp_usbpd.oob_event = dp_hpd_oob_event; return &dp_hpd->dp_usbpd; } diff --git a/drivers/gpu/drm/msm/dp/dp_hpd.h b/drivers/gpu/drm/msm/dp/dp_hpd.h index 8feec5aa5027..310ecc2a8538 100644 --- a/drivers/gpu/drm/msm/dp/dp_hpd.h +++ b/drivers/gpu/drm/msm/dp/dp_hpd.h @@ -29,7 +29,9 @@ enum plug_orientation { * @hpd_irq: Change in the status since last message * @alt_mode_cfg_done: bool to specify alt mode status * @debug_en: bool to specify debug mode + * @connected: cable currently connected * @connect: simulate disconnect or connect for debug mode + * @oob_event: deliver oob event to the usbpd code */ struct dp_usbpd { enum plug_orientation orientation; @@ -41,8 +43,10 @@ struct dp_usbpd { bool hpd_irq; bool alt_mode_cfg_done; bool debug_en; + bool connected; int (*connect)(struct dp_usbpd *dp_usbpd, bool hpd); + void (*oob_event)(struct dp_usbpd *dp_usbpd, bool hpd_state); }; /**