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);