From patchwork Fri Apr 29 19:29:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 568225 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2916AC433F5 for ; Fri, 29 Apr 2022 19:29:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359274AbiD2Tcw (ORCPT ); Fri, 29 Apr 2022 15:32:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239127AbiD2Tcw (ORCPT ); Fri, 29 Apr 2022 15:32:52 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6174ACFE78 for ; Fri, 29 Apr 2022 12:29:33 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id w19so15729033lfu.11 for ; Fri, 29 Apr 2022 12:29:33 -0700 (PDT) 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=yjiWSb36gHEJ1pupckIvzivsOKw4TFaRqlM2gJWlkeg=; b=VvyHyWk9ss55mLpsJMhmDjLhAfzhgVwTosz5/KtUeXG8f7gtCjTHh9ta12MW8Q8Qv5 4DCA1vAf+oNQJ5HTw+zih0F5/DyFy+nm53WCzwbk3uXoIyM8g/8pKcgK21gXn58WtvKA J4zl4mtbS1F+is88ser58AScok4CrSoRmJtjvvuNn1454jhm3si8OX9Qs6KdGc+I4Sgo RTcEoD6xMlh0TttERyIG4Zsvx0Pls4MCEJhOrW0XfLUoGWJVTMZPsBSPpFpBXd5mdirm hIGNDG+xAirjAo4pgoGFeJ08L39dxzZ1Xcn9luY4BXXFvAOC33bzkReV+4C0CRtn4fyG 6shg== 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=yjiWSb36gHEJ1pupckIvzivsOKw4TFaRqlM2gJWlkeg=; b=Ldsi6tzw7uJV2SbPGqnqOdXc3cIMLBrSyXDQ2nBvoHmYQigL7prgXeh2RdN7ALWwT4 D3hLN5th2+ON4X05S7O2Duf58G9t5KmYFx8VxZIYmAs/mWVxzNckSFMJHsLh0DXBnSsU AGX+OPp7L3SlRzDJD+dGftz98bqUJGPVDa0S6ju6q8ay2qfH+U3uv5YW1PXi3lTT7VsO 3p8y/ijjJhyB6jiTqgZCaVa3lEPnTQLxCC5Qlppx8ocLGHbYer4gNrPd4JIhGiFc01ew bBHy+GyfFlWYyM5VOttpvcxG5dWljL0g+mAbtnMwcfj/BEWAFdct4vLdoG3Q4d8WqQll CiOg== X-Gm-Message-State: AOAM531EnpQBkuJHUAjIRmFKHwNtUh+mnE21viBT1EontwteZBF/3/58 E6i05t7pCmg0LeT4vLFzx4678Q== X-Google-Smtp-Source: ABdhPJwZsF+ismHXA1SwjcjwLTj06u3hcpcicsYABBKTikMY3EqCe2yKGTDrLfdc4eDJFLhtBjsEQw== X-Received: by 2002:a05:6512:21cc:b0:46f:47c0:9c20 with SMTP id d12-20020a05651221cc00b0046f47c09c20mr572436lft.74.1651260571698; Fri, 29 Apr 2022 12:29:31 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id y10-20020ac24e6a000000b0047255d211e7sm5522lfs.278.2022.04.29.12.29.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 12:29:30 -0700 (PDT) From: Dmitry Baryshkov To: Bjorn Andersson Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Subject: [RFC PATCH 1/4] drm/bridge_connector: stop filtering events in drm_bridge_connector_hpd_cb() Date: Fri, 29 Apr 2022 22:29:25 +0300 Message-Id: <20220429192928.3697407-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220429192928.3697407-1-dmitry.baryshkov@linaro.org> References: <20220429192928.3697407-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org In some cases the bridge drivers would like to receive hotplug events even in the case new status is equal to the old status. In the DP case this is used to deliver "attention" messages to the DP host. Stop filtering the events in the drm_bridge_connector_hpd_cb() and let drivers decide whether they would like to receive the event or not. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/drm_bridge_connector.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/drm_bridge_connector.c b/drivers/gpu/drm/drm_bridge_connector.c index 60923cdfe8e1..a0b742ebb330 100644 --- a/drivers/gpu/drm/drm_bridge_connector.c +++ b/drivers/gpu/drm/drm_bridge_connector.c @@ -113,16 +113,11 @@ static void drm_bridge_connector_hpd_cb(void *cb_data, struct drm_bridge_connector *drm_bridge_connector = cb_data; struct drm_connector *connector = &drm_bridge_connector->base; struct drm_device *dev = connector->dev; - enum drm_connector_status old_status; mutex_lock(&dev->mode_config.mutex); - old_status = connector->status; connector->status = status; mutex_unlock(&dev->mode_config.mutex); - if (old_status == status) - return; - drm_bridge_connector_hpd_notify(connector, status); drm_kms_helper_hotplug_event(dev); From patchwork Fri Apr 29 19:29:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 568224 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15B20C433FE for ; Fri, 29 Apr 2022 19:29:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377862AbiD2Tcz (ORCPT ); Fri, 29 Apr 2022 15:32:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239127AbiD2Tcy (ORCPT ); Fri, 29 Apr 2022 15:32:54 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33951D0804 for ; Fri, 29 Apr 2022 12:29:34 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id m23so11637526ljb.8 for ; Fri, 29 Apr 2022 12:29:34 -0700 (PDT) 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=3QARc1+yD0fnTMQkv8qdIG/5WzoseXPaiXdNk/KEbVY=; b=erC9DYpFU2uSAN1Pt/WoyW5DVqz7ypXfZLv//Z3TaDycQcxnNUiC5+kfFaR60P3PTq j4Ys7T3c7tyY948ntLC1V+uQ5qRnvEQ1XHK5xz0foSLg6B5EtyLuGiF0rp/r3za9uF+K xWyUXHTd/aid4YwbpXsW36g6pGg4/nFiZFzhI97A/WtykGhex2rvjTzgmnDA/ywg7bSn Tk2fxX7NtTNLx+O0xZTXfoGGHag60O5laQF84okDYAkWHvXSpmWUk6RV7sereT1ZO3/A Yxc5ONt+gL6cdFV4OPP82O11n4OlZ7+HVp68J5Y4BSbh2Y7kO3K2GAvnUFgcdiLY20Ju r8aA== 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=3QARc1+yD0fnTMQkv8qdIG/5WzoseXPaiXdNk/KEbVY=; b=rn4BLjOivaNrgPnNi8J4X+5nRUUIidyMQMyvsWtDCR5w9zF5ciF+r1C/5gT3fPuXng pG3QfEKiOuIyYn/t9oFyNqErcBMmfipxWzkHv4AWZJsrjfjJB3jI4/2v7WpvgJ3flfw4 /DTQvHImBBE3DGWSScHnoyu0v4Oa72m0FNq8Ygrg6fGVZkbiFSBV9p3lLr3tHnbdXOLe jKMyKJtJH5xFndwL8lgVt9evfm56CdVJIPG2V5gOnRlE3nWhMHU/cEOcN2GHo7jkEEwd S0zDz+Ay/DHRg0J8KxXdcnbtCsP7V2cs8aUYb0NkTxn/EL8X52eZjGkbKbNQLd8xGYYS p+WA== X-Gm-Message-State: AOAM532jyLkSQjEZcAzV7Gu043qkoKXtUiVcB5lHLtSwzv2+hlAEkqiq 3LdOLJ7u0p7xoHUg6F4epyLpog== X-Google-Smtp-Source: ABdhPJy79cQiclX2W9ckJRUhshoL6ciRFs3b7NW6QE7A09Fl34aambXDyjznizZcCOIM+dNCjP0eKA== X-Received: by 2002:a2e:b88e:0:b0:24f:2f69:3c16 with SMTP id r14-20020a2eb88e000000b0024f2f693c16mr473248ljp.210.1651260572549; Fri, 29 Apr 2022 12:29:32 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id y10-20020ac24e6a000000b0047255d211e7sm5522lfs.278.2022.04.29.12.29.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 12:29:31 -0700 (PDT) From: Dmitry Baryshkov To: Bjorn Andersson Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Subject: [RFC PATCH 2/4] drm: Add HPD state to drm_connector_oob_hotplug_event() Date: Fri, 29 Apr 2022 22:29:26 +0300 Message-Id: <20220429192928.3697407-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220429192928.3697407-1-dmitry.baryshkov@linaro.org> References: <20220429192928.3697407-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Bjorn Andersson 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 [DB: replaced drm_connector_hpd_state with drm_connector_status] Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/drm_connector.c | 6 ++++-- drivers/gpu/drm/i915/display/intel_dp.c | 17 ++++++++++++++--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/usb/typec/altmodes/displayport.c | 10 +++------- include/drm/drm_connector.h | 6 ++++-- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 76a8c707c34b..ae8b80bc050d 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -2828,6 +2828,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: hot plug detect logical state * * 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 @@ -2837,7 +2838,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, + enum drm_connector_status status) { struct drm_connector *connector; @@ -2846,7 +2848,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, status); 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 d667657e3606..2acfc068ff51 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4825,15 +4825,26 @@ 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, + enum drm_connector_hpd_state hpd_state) { struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); struct drm_i915_private *i915 = to_i915(connector->dev); + bool hpd_high = hpd_state == DRM_CONNECTOR_HPD_HIGH; + unsigned int hpd_pin = encoder->hpd_pin; + bool need_work = false; spin_lock_irq(&i915->irq_lock); - i915->hotplug.event_bits |= BIT(encoder->hpd_pin); + if (hpd_high != test_bit(hpd_pin, &i915->hotplug.oob_hotplug_last_state)) { + i915->hotplug.event_bits |= BIT(hpd_pin); + + __assign_bit(hpd_pin, &i915->hotplug.oob_hotplug_last_state, hpd_high); + 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 fa14da84362e..e1e4ee1ab7df 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -138,6 +138,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 for each encoder */ + unsigned long oob_hotplug_last_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..ea9cb1d71fd2 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,8 @@ 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 ? DRM_CONNECTOR_HPD_HIGH : DRM_CONNECTOR_HPD_LOW); } return ret; @@ -573,8 +570,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, DRM_CONNECTOR_HPD_LOW); fwnode_handle_put(dp->connector_fwnode); } diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 5166186146f4..5670f7d18440 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1141,7 +1141,8 @@ 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, + enum drm_connector_status status); /** * @debugfs_init: @@ -1749,7 +1750,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, + enum drm_connector_status status); 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 Fri Apr 29 19:29:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 567553 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0933C433F5 for ; Fri, 29 Apr 2022 19:29:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376657AbiD2Tcz (ORCPT ); Fri, 29 Apr 2022 15:32:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377206AbiD2Tcy (ORCPT ); Fri, 29 Apr 2022 15:32:54 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C85DCFE78 for ; Fri, 29 Apr 2022 12:29:35 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id j4so15736992lfh.8 for ; Fri, 29 Apr 2022 12:29:35 -0700 (PDT) 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=SqMz6+QA40GWihsDI2sybGR2gK7KNbiJwJGp8fjNk80=; b=Ko1AxuJM2eP1Ei1Sjoh5rpqurh+hCqMjC52gROd4yaSlDbxO7zSgfbtz0UhkBYrzV2 SkhLCSxxlE5wug28wbd7kYDf2a3o3Sj2eoQuBDC2fmRTUl4NzyM4IcY5t5ClBhVHuaBQ mQlYjciWeICPTJW6WMAy7UfpQHqCgL543Lip7ScUrF+WvDagfV9PdNHH9kGq4EOA/1J+ GsQmIM3UH0VtD/u16A/r9o6haeCbGPLYtcGAZnvBAJNiI5jCO/q1kSExLl4Rd548a5EW K7apr6klMxiwt055UZRhJHnONtcASn1cl8CgP1lsqQ5Nrjag3F+Xne48rXY4KdcqFc2F 4fmw== 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=SqMz6+QA40GWihsDI2sybGR2gK7KNbiJwJGp8fjNk80=; b=fbAGN6ECEPNJGbganlaxXjDOSSKHyd9sIowUaN1u4Uu4bAAueMnMJ3NbNi0b43ibce pc4IbsZAebi1aLS70CGBpP1OkcSf8qhAZDulYw0+ZZnD/PHufY72fA3PJTKMtg5QBCyf BcZDHXJksl48M6SBz/KFC5W3oG3Eog3pTQdTOAa+0i/F4VjvyqhjQEn/s/xE29Rdt+Gf D9bfhPUSbqzG1dWvihRptD7EIYg4giEMLxXjifY72fqj8pabxkkRnKsD/jdf9RKYg1yZ 7K8sibBacPeN2iyA/x85FnJsogSg3/5klz4clj4qv+95X5ee62U+ULu5D1Pvd39Dps4K 4tUA== X-Gm-Message-State: AOAM530K9Q65ZC9P3HV6qYMOFnrPg2Ej2KV4jV+vNCAKhuB6x21Vm0So Niq9mfu9COK6R235QLIcog8oJw== X-Google-Smtp-Source: ABdhPJwaHubY6aVhB4RinSAXXT9idb/jHyZNS0vOzM4aU2LS5OIMn/oSoxCOAWQdtDpsekahizZXrA== X-Received: by 2002:a05:6512:4021:b0:472:2513:4503 with SMTP id br33-20020a056512402100b0047225134503mr495697lfb.357.1651260573643; Fri, 29 Apr 2022 12:29:33 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id y10-20020ac24e6a000000b0047255d211e7sm5522lfs.278.2022.04.29.12.29.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 12:29:33 -0700 (PDT) From: Dmitry Baryshkov To: Bjorn Andersson Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Subject: [RFC PATCH 3/4] drm/bridge_connector: implement oob_hotplug_event Date: Fri, 29 Apr 2022 22:29:27 +0300 Message-Id: <20220429192928.3697407-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220429192928.3697407-1-dmitry.baryshkov@linaro.org> References: <20220429192928.3697407-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Implement the oob_hotplug_event() callback. Translate it to the the HPD notification sent to the HPD bridge in the chain. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/drm_bridge_connector.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/drm_bridge_connector.c b/drivers/gpu/drm/drm_bridge_connector.c index a0b742ebb330..b14af1c7ac07 100644 --- a/drivers/gpu/drm/drm_bridge_connector.c +++ b/drivers/gpu/drm/drm_bridge_connector.c @@ -123,6 +123,17 @@ static void drm_bridge_connector_hpd_cb(void *cb_data, drm_kms_helper_hotplug_event(dev); } +static void drm_bridge_connector_oob_hotplug_event(struct drm_connector *connector, + enum drm_connector_status status) +{ + struct drm_bridge_connector *bridge_connector = + to_drm_bridge_connector(connector); + struct drm_bridge *hpd = bridge_connector->bridge_hpd; + + if (hpd) + drm_bridge_hpd_notify(hpd, status); +} + /** * drm_bridge_connector_enable_hpd - Enable hot-plug detection for the connector * @connector: The DRM bridge connector @@ -233,6 +244,7 @@ static const struct drm_connector_funcs drm_bridge_connector_funcs = { .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .debugfs_init = drm_bridge_connector_debugfs_init, + .oob_hotplug_event = drm_bridge_connector_oob_hotplug_event, }; /* ----------------------------------------------------------------------------- From patchwork Fri Apr 29 19:29:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 567552 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 696A0C433EF for ; Fri, 29 Apr 2022 19:29:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239127AbiD2Tc4 (ORCPT ); Fri, 29 Apr 2022 15:32:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377206AbiD2Tcz (ORCPT ); Fri, 29 Apr 2022 15:32:55 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4016DD0809 for ; Fri, 29 Apr 2022 12:29:36 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id bu29so15823945lfb.0 for ; Fri, 29 Apr 2022 12:29:36 -0700 (PDT) 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=UhpZL5l0f3vh0d/Ml8kKWbY8CArm0yb/cqnRf9hoyzA=; b=F2/j3U7fr2mTYgL8YPuSZje27XcsSQgMmjgKSAzTfqA9T5CAdNLeumG2PTdn+ieOM/ 2ldvmQQr+xd7Am4jc74DqiJavKZeVZ/h/9TD8BLFE83MJlyZOKIcAX/6R5c3TNJ0z+W6 E/RtLlB324Rqa5dX3UH/eXU4tglb9GNG7rkse01iDSlnMvuRO+u+2vp93Jsx/EEdmUGz YlBDn8Kwuf0TG7MvwE1CHIYiHH12BVdF8V+ZSR8bNiu68sGsbQOpbgFq/4d4mnKNFshj +1HEwZ57Dg+hIH5s4f5VGSCunaMMGh/hgeOf9GQ14p5kQjbZGxIJRuGJRVIlCycTLm/h zo9A== 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=UhpZL5l0f3vh0d/Ml8kKWbY8CArm0yb/cqnRf9hoyzA=; b=ybbiN/rVlsKY6O5TU6v2ZqogjZS/sHfHIjNtbRouORv0p9jmephHyADb3/h9ErPLqq hzqF1HNPmZcH+XPLvT8gsJ7R+McJUvIrYlp28z3A3myYaCMlLT5buEgFT4/OgbQGmtOU VyxpdB1RLI4VoqlspB0ckMlgZZ8Kl5WtEHRv3sIOrPX7hPbdZQ/2ZNr+uBjUWb7VhmXi D5mtvP5uT55ZQHy4Kng+rC5tvxGkDUBvqGYAP3rzkVgiWfQwyGN/LdG/kSlSBNUg2BND oWov4kEfnpf0/ExrRUziixbCcYafyqkcMetELZAyYB8QBTYP1Z8906H7yJcbCrjaUWlZ USHA== X-Gm-Message-State: AOAM5307gWZYu8W0V9NOzP8l034W5J1zTae3Q2/9ZPB5eL5IgT6+nmS3 RH9tbTy8LspRqk9t5byXS2iTcCBxuIgD8Q== X-Google-Smtp-Source: ABdhPJwbRIdOU0t3vyTifaegh0vETKAf/A2nQXHy38LK7MHv/O4wW9W0UzOqCnqyYf5+bPyAVJ6C9Q== X-Received: by 2002:a05:6512:1509:b0:443:e7fa:1c68 with SMTP id bq9-20020a056512150900b00443e7fa1c68mr541266lfb.58.1651260574586; Fri, 29 Apr 2022 12:29:34 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id y10-20020ac24e6a000000b0047255d211e7sm5522lfs.278.2022.04.29.12.29.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 12:29:34 -0700 (PDT) From: Dmitry Baryshkov To: Bjorn Andersson Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Subject: [RFC PATCH 4/4] drm/msm/dp: Implement hpd_notify() Date: Fri, 29 Apr 2022 22:29:28 +0300 Message-Id: <20220429192928.3697407-5-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220429192928.3697407-1-dmitry.baryshkov@linaro.org> References: <20220429192928.3697407-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Bjorn Andersson 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 hpd_notify() 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 [DB: rebased to use drm_bridge_connector] Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dp/dp_display.c | 11 +++++++++++ drivers/gpu/drm/msm/dp/dp_display.h | 1 + drivers/gpu/drm/msm/dp/dp_drm.c | 3 +++ drivers/gpu/drm/msm/dp/dp_drm.h | 2 ++ drivers/gpu/drm/msm/dp/dp_hpd.c | 21 +++++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_hpd.h | 5 +++++ 6 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 c38832304353..31540d1409eb 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -1300,6 +1300,7 @@ static int dp_display_probe(struct platform_device *pdev) if (!desc) return -EINVAL; + dp->dp_display.dev = &pdev->dev; dp->pdev = pdev; dp->name = "drm_dp"; dp->dp_display.connector_type = desc->connector_type; @@ -1789,3 +1790,13 @@ void dp_bridge_mode_set(struct drm_bridge *drm_bridge, dp_display->dp_mode.h_active_low = !!(dp_display->dp_mode.drm_mode.flags & DRM_MODE_FLAG_NHSYNC); } + +void dp_bridge_hpd_notify(struct drm_bridge *bridge, + enum drm_connector_status status) +{ + struct msm_dp_bridge *dp_bridge = to_dp_bridge(bridge); + struct msm_dp *dp = dp_bridge->dp_display; + struct dp_display_private *dp_display = container_of(dp, struct dp_display_private, dp_display); + + dp_display->usbpd->hpd_notify(dp_display->usbpd, status); +} diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h index 4f9fe4d7610b..2d2614bc5a14 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; diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c index 62d58b9c4647..821cfd37b1fb 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -68,6 +68,7 @@ static const struct drm_bridge_funcs dp_bridge_ops = { .mode_valid = dp_bridge_mode_valid, .get_modes = dp_bridge_get_modes, .detect = dp_bridge_detect, + .hpd_notify = dp_bridge_hpd_notify, }; struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev, @@ -138,6 +139,8 @@ struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display) if (IS_ERR(connector)) return connector; + connector->fwnode = fwnode_handle_get(dev_fwnode(dp_display->dev)); + drm_connector_attach_encoder(connector, dp_display->encoder); return connector; diff --git a/drivers/gpu/drm/msm/dp/dp_drm.h b/drivers/gpu/drm/msm/dp/dp_drm.h index f4b1ed1e24f7..3b7480a86844 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.h +++ b/drivers/gpu/drm/msm/dp/dp_drm.h @@ -32,5 +32,7 @@ enum drm_mode_status dp_bridge_mode_valid(struct drm_bridge *bridge, void dp_bridge_mode_set(struct drm_bridge *drm_bridge, const struct drm_display_mode *mode, const struct drm_display_mode *adjusted_mode); +void dp_bridge_hpd_notify(struct drm_bridge *bridge, + enum drm_connector_status status); #endif /* _DP_DRM_H_ */ diff --git a/drivers/gpu/drm/msm/dp/dp_hpd.c b/drivers/gpu/drm/msm/dp/dp_hpd.c index db98a1d431eb..40ca91c7dabe 100644 --- a/drivers/gpu/drm/msm/dp/dp_hpd.c +++ b/drivers/gpu/drm/msm/dp/dp_hpd.c @@ -7,6 +7,8 @@ #include #include +#include +#include #include "dp_hpd.h" @@ -45,6 +47,24 @@ int dp_hpd_connect(struct dp_usbpd *dp_usbpd, bool hpd) return rc; } +static void dp_hpd_hpd_notify(struct dp_usbpd *dp_usbpd, + enum drm_connector_status status) +{ + struct dp_hpd_private *hpd_priv = container_of(dp_usbpd, struct dp_hpd_private, dp_usbpd); + + DRM_DEBUG_DP("status: %d connected: %d\n", status, dp_usbpd->connected); + + if (!dp_usbpd->connected && status == connector_status_connected) { + dp_usbpd->connected = true; + hpd_priv->dp_cb->configure(hpd_priv->dev); + } else if (status != connector_status_connected) { + 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 +82,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.hpd_notify = dp_hpd_hpd_notify; 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..ff40790831a4 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 + * @hpd_notify: deliver oob event to the usbpd code */ struct dp_usbpd { enum plug_orientation orientation; @@ -41,8 +43,11 @@ 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 (*hpd_notify)(struct dp_usbpd *dp_usbpd, + enum drm_connector_status status); }; /**