From patchwork Fri Apr 22 22:32:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 12824209 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 694B6C43217 for ; Fri, 22 Apr 2022 22:30:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8CF6E10E08A; Fri, 22 Apr 2022 22:30:30 +0000 (UTC) Received: from mail-oa1-x32.google.com (mail-oa1-x32.google.com [IPv6:2001:4860:4864:20::32]) by gabe.freedesktop.org (Postfix) with ESMTPS id BB5D510E082 for ; Fri, 22 Apr 2022 22:30:25 +0000 (UTC) Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-e604f712ecso10062147fac.9 for ; Fri, 22 Apr 2022 15:30:25 -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=llCxmLTdaCZHW14cipFv3zKVNDfg4S3k4Clp+5fnjFI=; b=h5DEHQlk+fmuvc0+DZD9NC4Fe0/4QoIQmg5FvCBetRbm49gLG1iDmBKTdFHUn6XSpE OfSVgokMm/O0iAioCNkrA0iUo1CoNtJM/2d4RA6abyhjtj713jxNEiwssjzL/I/3PvSc XZi9PDjbvj2mubCQvkvMFuRHm4CO2ry/q7KT4AHO1rOkSun8blesvUHXZeWfNe9hUh5D Z59EZCa3f1JkopcFSBhwO4k9CJqkGRm3mmP+/0dOduKiPYTJDMVIBtRHmSKgGz4xM1QD UctwP0Ov9asO/GKAoDV+nV9giz54Lc2+C3t2pQeatIEpWNEmipI+ffeNoa9FUdiUh8+1 x7lQ== 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=llCxmLTdaCZHW14cipFv3zKVNDfg4S3k4Clp+5fnjFI=; b=owAsJb38zTwg7JyIRMxzF4pJHRS4gk1OtliJ+sDoE2zvuCdeGujHQCC3ckneCncnyM Zt2M+3u9CYI76EBzokiADP7/YuWm3jrNaVzCNhQDjzn3tMRKabmcrlyDVXDso+EwlI/y X1uiFMhfRx7Iu/AZ5os1qlHfjWrRrNCvlwPlctegJcL95DPsPLLk9SyKbaCqfbyJDHl9 k5lAGRlNy2P63JNdHS+/u/2uZDT6ZIK8x+67HBsK5UJ3u9bcv+onDLIHUkEg/LHuEa3G hTqIX1gcTfFjyQGyjo+CMWZs5lGJCTqqmnwenZVmh5k1WBixFK88ZgEYHRPbZk2bVbEC VFJA== X-Gm-Message-State: AOAM530qNtWIw88iVQC78VBHSNJafz+Ft2vWNpmbR2mPa/PqlPCaZOxk QML3ScbowJ81+UBLXjUodeoXxQ== X-Google-Smtp-Source: ABdhPJz138kHCGoPHhU2qrDzH3POGVzi1U1OMbGNcHB9jQ41j8e0vvGToVhUplDG6/T+BzbPAtV2pQ== X-Received: by 2002:a05:6870:f21d:b0:e1:cb99:bd46 with SMTP id t29-20020a056870f21d00b000e1cb99bd46mr2880205oao.140.1650666625046; Fri, 22 Apr 2022 15:30:25 -0700 (PDT) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id a14-20020a544e0e000000b002f9c00dc626sm1218831oiy.28.2022.04.22.15.30.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 15:30:24 -0700 (PDT) From: Bjorn Andersson To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Rob Clark , Dmitry Baryshkov Subject: [PATCH v3 2/2] drm/msm/dp: Implement oob_hotplug_event() Date: Fri, 22 Apr 2022 15:32:25 -0700 Message-Id: <20220422223225.1297434-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220422223225.1297434-1-bjorn.andersson@linaro.org> References: <20220422223225.1297434-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 --- Changes since v2: - Rebased patch drivers/gpu/drm/msm/dp/dp_display.c | 9 +++++++++ drivers/gpu/drm/msm/dp/dp_display.h | 3 +++ drivers/gpu/drm/msm/dp/dp_drm.c | 11 +++++++++++ drivers/gpu/drm/msm/dp/dp_hpd.c | 21 +++++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_hpd.h | 5 +++++ 5 files changed, 49 insertions(+) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index a42732b67349..1019f6d8fd03 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -449,6 +449,14 @@ 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, + enum drm_connector_hpd_state 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); @@ -1302,6 +1310,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 7af2b186d2d9..16658270df2c 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,7 @@ 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, + enum drm_connector_hpd_state 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 80f59cf99089..76904b1601b1 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -123,6 +123,14 @@ 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, + enum drm_connector_hpd_state 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 +138,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 +169,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..cdb1feea5ebf 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_oob_event(struct dp_usbpd *dp_usbpd, + enum drm_connector_hpd_state 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 == DRM_CONNECTOR_HPD_HIGH) { + dp_usbpd->connected = true; + hpd_priv->dp_cb->configure(hpd_priv->dev); + } else if (hpd_state == DRM_CONNECTOR_HPD_LOW) { + 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.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..4166e5fd3156 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,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 (*oob_event)(struct dp_usbpd *dp_usbpd, + enum drm_connector_hpd_state hpd_state); }; /**