From patchwork Sat Jul 29 00:49:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 127947 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp792543vqg; Fri, 28 Jul 2023 18:40:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlEVMQ4p6aH1FmvU00bQ78u3yad9J6NeyEvFEXe/Hg+wcFBn88MHTLgChPXOMchDRfX/wlx5 X-Received: by 2002:a17:907:a077:b0:993:d536:3cb8 with SMTP id ia23-20020a170907a07700b00993d5363cb8mr710662ejc.2.1690594851285; Fri, 28 Jul 2023 18:40:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690594851; cv=none; d=google.com; s=arc-20160816; b=FEj41yfRPjPkPMLYhZNFM6Vv1XxIGH2f31D+93E4yU+p8YZsaEEmxj2HA/6A2vFVoM D43d0tno2lx31m7iWne4a59gyiGlE6sycu8tz9rM3/JmtXQpuY9j1uSXZdpWJzIT62Xv AkpX0/ATLokyG4VB5ASbbhUv5MIMIPMjW7WiYY2NLawbIhC57TMrP7xSx7QEgNQ5VONz wdQ3f5rh4bcR/1gVU2bCfGu/b3ZeNsxH7WqZ+uOHgyk5G7N8aKPdAWiY1lNKGE0WMqC1 VuuKEjopHO08kUa9Tgt15rijI1MBjJKwlA+9vAQwwWXQms9siYopWzPbMMNCeVjJMCPP vjjw== 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=PMSy/K1CIsccW2sw1PgTe2FDAawI36xm/3iEipD6VMg=; fh=Ijs4z7asxnxZXSXH1iKU90GjPS2pk4sYIkJQzsSgRPM=; b=qPV1OHVnkXfXF2Al12Dg7q88tZbVc0bsR3OibqGqSwf0z7fWq1iSTt6FBfXFeTIO4a QdknyTttHWyBQxbfUnPITT0Fco3j5jC9fbC5neMb8znWvtxaG9wMru1+3ZpiC2iVfPux Mvbbylpnu4FYQes41WFToFKHJrBgeITkSXgJURTI4nYpfNeQXcVtjC6KOcpazQsOyLtZ FF1qC3emdDYj8JaR6NUDMDIP5i+TkkYhY97G1iMTTp2GkQDAZeugziwtMhi9YPajyACN bXx++wG8AJZI3ohOlg986hrx3O80vLDDDW4qMEjSpLjWE7+gPe+Ik5fxtSklEv9AHCYb RpNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oy3nXUj7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m15-20020a17090607cf00b00992d6e88081si3459356ejc.956.2023.07.28.18.40.22; Fri, 28 Jul 2023 18:40:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oy3nXUj7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S236861AbjG2Aux (ORCPT + 99 others); Fri, 28 Jul 2023 20:50:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237064AbjG2Auj (ORCPT ); Fri, 28 Jul 2023 20:50:39 -0400 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 3B85D46BE for ; Fri, 28 Jul 2023 17:50:08 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-4fb7dc16ff0so4649814e87.2 for ; Fri, 28 Jul 2023 17:50:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690591755; x=1691196555; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PMSy/K1CIsccW2sw1PgTe2FDAawI36xm/3iEipD6VMg=; b=oy3nXUj7xNj7CjIZly7ArdxVtmlQ1TkziV/9V//vqNUR5M1WSFNFgzlosb86fW13jm vp9kbDQgqW9KxX/VNfpSqZpTqhz9J9JGbQkn/htKPrfozoXhWUTrwOSS9YcmZg2AngQ1 Exe02UvHl+zKB1Eq+M1UxA30G7bg83R6pl8wjLqRw/i6yaxgkZf6oxtWSSiJIc1L4xnU Ndih1C5ATiTqC8b+Hrev//VhzaoOVlcEX/EC6SY6cMFK2mscNaimcAyI8T0VHKq3gokw tMvHaw9A5mvr2AuDyEeWvKpYC8CJsBdiIJ3EnICAx17dacWnesx7ewmXANr4tNd9jrrH FnlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690591755; x=1691196555; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PMSy/K1CIsccW2sw1PgTe2FDAawI36xm/3iEipD6VMg=; b=kAgi5LhQUx7xmDDWb7zxEuyBeUzZGh6bR6DHJY6xobDEWq36E4Wi4d2xdtPq+2uBo4 r51+9jwEm6B4mlHoyZJq+94OGQuyQ2kSkESGRvE00cyEafQ8ug7zqqJQEpDqIvIECLvm wM4pRlr0m1bKLs/wV/jmOQ/HXCOhrEdXf+5RVeCrcLdu/S0A2lEfBpNEWiI+OyH1bzgy hmA27Xle1I3yBduE49RhFpwLZdRa5Nfc3gmCHz53JfAALWFKh5EnXIIVdbxRdgZje1r6 ZQ/tOJ6Jlolt/LbINiOqp4XWcR7+sFiwNJvyMKyT2HYtJXoDgtqtH9fvzPdqTxB8BkzS x++A== X-Gm-Message-State: ABy/qLaw8jrMQV8LcXvN6bnYSTGs+E/68lehHyO+gpCJNC153DO+1+8t pHBDOgxcm+4gu3gMSGTrB8z/+w== X-Received: by 2002:a05:6512:465:b0:4fb:9129:705b with SMTP id x5-20020a056512046500b004fb9129705bmr2550632lfd.6.1690591755108; Fri, 28 Jul 2023 17:49:15 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id a24-20020a19f818000000b004fe20d1b288sm500702lff.159.2023.07.28.17.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 17:49:14 -0700 (PDT) From: Dmitry Baryshkov To: David Airlie , Daniel Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Andy Gross , Bjorn Andersson , Konrad Dybcio , Simon Ser , Janne Grunau Cc: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , Harry Wentland , Leo Li , Rodrigo Siqueira , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 1/4] drm: allow specifying default subtype for the DP subconnector property Date: Sat, 29 Jul 2023 03:49:10 +0300 Message-Id: <20230729004913.215872-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230729004913.215872-1-dmitry.baryshkov@linaro.org> References: <20230729004913.215872-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772717186525961004 X-GMAIL-MSGID: 1772717186525961004 In the embedded usecases the default subtype depends on the bridge chain, so it is easier to specify the subtype at the proprety attachment type rather than specifying it later. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 3 ++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 ++- drivers/gpu/drm/drm_connector.c | 6 ++++-- drivers/gpu/drm/i915/display/intel_dp.c | 3 ++- include/drm/drm_connector.h | 3 ++- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index d34037b85cf8..c18459ecd4be 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -2022,7 +2022,8 @@ amdgpu_connector_add(struct amdgpu_device *adev, if (connector_type == DRM_MODE_CONNECTOR_DisplayPort || connector_type == DRM_MODE_CONNECTOR_eDP) { - drm_connector_attach_dp_subconnector_property(&amdgpu_connector->base); + drm_connector_attach_dp_subconnector_property(&amdgpu_connector->base, + DRM_MODE_SUBCONNECTOR_Unknown); } return; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 943959012d04..297321f0199e 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -759,7 +759,8 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, drm_dp_mst_topology_mgr_init(&aconnector->mst_mgr, adev_to_drm(dm->adev), &aconnector->dm_dp_aux.aux, 16, 4, aconnector->connector_id); - drm_connector_attach_dp_subconnector_property(&aconnector->base); + drm_connector_attach_dp_subconnector_property(&aconnector->base, + DRM_MODE_SUBCONNECTOR_Unknown); } int dm_mst_get_pbn_divider(struct dc_link *link) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index a3d3e7dc08b2..a6066e4a5e9a 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1577,10 +1577,12 @@ EXPORT_SYMBOL(drm_mode_create_dvi_i_properties); /** * drm_connector_attach_dp_subconnector_property - create subconnector property for DP * @connector: drm_connector to attach property + * @subtype: initial value for the subconnector type * * Called by a driver when DP connector is created. */ -void drm_connector_attach_dp_subconnector_property(struct drm_connector *connector) +void drm_connector_attach_dp_subconnector_property(struct drm_connector *connector, + enum drm_mode_subconnector subtype) { struct drm_mode_config *mode_config = &connector->dev->mode_config; @@ -1594,7 +1596,7 @@ void drm_connector_attach_dp_subconnector_property(struct drm_connector *connect drm_object_attach_property(&connector->base, mode_config->dp_subconnector_property, - DRM_MODE_SUBCONNECTOR_Unknown); + subtype); } EXPORT_SYMBOL(drm_connector_attach_dp_subconnector_property); diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 474785110662..5819105187f6 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -5391,7 +5391,8 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect enum port port = dp_to_dig_port(intel_dp)->base.port; if (!intel_dp_is_edp(intel_dp)) - drm_connector_attach_dp_subconnector_property(connector); + drm_connector_attach_dp_subconnector_property(connector, + DRM_MODE_SUBCONNECTOR_Unknown); if (!IS_G4X(dev_priv) && port != PORT_A) intel_attach_force_audio_property(connector); diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 5a8115dca359..a130a78f6e0f 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1990,7 +1990,8 @@ const char *drm_get_hdcp_content_type_name(int val); int drm_get_tv_mode_from_name(const char *name, size_t len); int drm_mode_create_dvi_i_properties(struct drm_device *dev); -void drm_connector_attach_dp_subconnector_property(struct drm_connector *connector); +void drm_connector_attach_dp_subconnector_property(struct drm_connector *connector, + enum drm_mode_subconnector subtype); int drm_mode_create_tv_margin_properties(struct drm_device *dev); int drm_mode_create_tv_properties_legacy(struct drm_device *dev, From patchwork Sat Jul 29 00:49:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 127924 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp787758vqg; Fri, 28 Jul 2023 18:24:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlHrpFLaBxKdsbXCbUReGtDYZ3yHoMGIKBAwZ4l75HuUEpOZaues3fPtEtXM018Bu8yMIe8Z X-Received: by 2002:a05:6a21:488b:b0:134:7364:a59f with SMTP id av11-20020a056a21488b00b001347364a59fmr4043431pzc.29.1690593848493; Fri, 28 Jul 2023 18:24:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690593848; cv=none; d=google.com; s=arc-20160816; b=Lp3XrckPMFvyeNLVjVIYtlJvhawP3K8S3V6T190p1Wug9k4EUAo+SAlwHinv2HhzdC akq3pPot6buMfEXLPQzOzIwzJTtZKAbW4AI9MNySlrYxOuZhL3lNR91qdqwSO7YNppAp cFqs3a9zD+yz/WQhBdF9BTXWR6CPgQFGaDOj38BDWfLlPigWGzYhdWXGe5gDMaBq/HcM to2abjh9uHLTJNgTm1GOacA6xoqVn8YwGRXu2PKcvcbDekwtq9SX8kIjQWzynb1bO37/ v6pJFcCYGOm9DH6J4+KoOWkkVXStEWq9YMFwMzFiYXeMfbOIC8RfpQYj1DKXerchezhf LiIw== 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=YW+vdrPDM+RdVg71eRxchKCcF3Il7t8mgNv0e+r+q2g=; fh=Ijs4z7asxnxZXSXH1iKU90GjPS2pk4sYIkJQzsSgRPM=; b=HvpraC6cxqImQakyJrkgEuL6C7I5ITMUV6xVh0ihyEuVH9nhCI/T07oKuyF5C0C4Le ZwFD94A+6Z+o1nJSGFu6/+jRs7t7zgjWr8M5EXed4k2hDgZVzZ9ji/PUolgTRvicspnZ pVnsuKnOEvg7CbKoeTjJDXrac4COpJCl50JDoY3ERde6c7kw03j7DZ/cQElGqv3qQjc+ ttqUrdh2O2piZF54cvKBP3POPjrXe/cnY70udUDOgEwIztchzeMSK4OMRW0/pJ6k3QZg eIS8Ppi4oD205PfqWXq51T6trMSrrZvBZ1/Ks565qduoCeacszj2Z+8XgPli3O9zFD1H 3MPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sgJZMUpp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p30-20020a631e5e000000b0055b7319a311si3709742pgm.356.2023.07.28.18.23.55; Fri, 28 Jul 2023 18:24:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sgJZMUpp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S232123AbjG2BCg (ORCPT + 99 others); Fri, 28 Jul 2023 21:02:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236519AbjG2BCe (ORCPT ); Fri, 28 Jul 2023 21:02:34 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2612D3C33 for ; Fri, 28 Jul 2023 18:02:06 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-991da766865so368870166b.0 for ; Fri, 28 Jul 2023 18:02:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690592519; x=1691197319; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YW+vdrPDM+RdVg71eRxchKCcF3Il7t8mgNv0e+r+q2g=; b=sgJZMUppk51vG9NQLtB6RwoaQNyvkwHnBaeMFnTaBVFsLUM/CuWpYoyaqsfFPspBT0 sTPY/fw4jOQ0yQQQIBCkZW8clyjaJkbR3hojtql3mlP54YgbkyDTGQaV14sP2prxeNrL Fn6fH0Nx7A94g6JMrBD9wLlnQ31WeHapS9AFHXQD/hILOUJ+T0INg6XudXbKJpUBaMfo OKOt872ln+siWrPz6ZhnjYiLRQ1yVWAtdLEvb5fiSaeui1heY4p9FQ+4eRiguh4wqDxH PQyNu0TdHFqoEOcE16dwuFvuZPVdxTu/YazVoSeh9WQgy7ulIHF/frEfHa63Q4UqArjj gF2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690592519; x=1691197319; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YW+vdrPDM+RdVg71eRxchKCcF3Il7t8mgNv0e+r+q2g=; b=VOoagDnezcPRwq157jW+ZPBk3vbVGCOJlX/Xo/vfqM723TdqONqYnujq/OG01oI2GX I6aBDRQ8TZjaDCkeP0V1TtCNmdNOdf2IvlrpfKPw6izGvT05C3HfFjKw0U0sofyROeIU u7/g7Yn8SPCySM+xfk3iznYopzJnHObPPt5CDZRQI4/SaPALFPu6aebQ7NNagPiE6foA qXw/sJJRjHmMEr4DAnsc2YS2lNGVWBMmz/8PWOkIckRZOWYdP4jWdvA31Ec07vrO+YsB 6nEKCXSyXJeH9XziSKGPHRJD/wDcFRMHjgttAw6pcoPZl0fm5P01iV/nz/0D0usxPV3P xYsw== X-Gm-Message-State: ABy/qLawFV3GP5xivLowKbz6MekUqqkyS9/mYGBCRBkJp7o/RrBE+68e 3beGcjJokzZT865m0Z5s+YRSpfudHUM/aiU5hl8= X-Received: by 2002:a19:915c:0:b0:4f8:711b:18b0 with SMTP id y28-20020a19915c000000b004f8711b18b0mr2325597lfj.3.1690591756020; Fri, 28 Jul 2023 17:49:16 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id a24-20020a19f818000000b004fe20d1b288sm500702lff.159.2023.07.28.17.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 17:49:15 -0700 (PDT) From: Dmitry Baryshkov To: David Airlie , Daniel Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Andy Gross , Bjorn Andersson , Konrad Dybcio , Simon Ser , Janne Grunau Cc: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , Harry Wentland , Leo Li , Rodrigo Siqueira , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 2/4] drm/bridge-connector: handle subconnector types Date: Sat, 29 Jul 2023 03:49:11 +0300 Message-Id: <20230729004913.215872-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230729004913.215872-1-dmitry.baryshkov@linaro.org> References: <20230729004913.215872-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772716135574091168 X-GMAIL-MSGID: 1772716135574091168 If the created connector type supports subconnector type property, create and attach corresponding it. The default subtype value is 0, which maps to the DRM_MODE_SUBCONNECTOR_Unknown type. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/drm_bridge_connector.c | 33 +++++++++++++++++++++++++- include/drm/drm_bridge.h | 4 ++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_bridge_connector.c b/drivers/gpu/drm/drm_bridge_connector.c index 07b5930b1282..a7b92f0d2430 100644 --- a/drivers/gpu/drm/drm_bridge_connector.c +++ b/drivers/gpu/drm/drm_bridge_connector.c @@ -329,7 +329,9 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, struct drm_connector *connector; struct i2c_adapter *ddc = NULL; struct drm_bridge *bridge, *panel_bridge = NULL; + enum drm_mode_subconnector subconnector; int connector_type; + int ret; bridge_connector = kzalloc(sizeof(*bridge_connector), GFP_KERNEL); if (!bridge_connector) @@ -365,8 +367,10 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, if (bridge->ops & DRM_BRIDGE_OP_MODES) bridge_connector->bridge_modes = bridge; - if (!drm_bridge_get_next_bridge(bridge)) + if (!drm_bridge_get_next_bridge(bridge)) { connector_type = bridge->type; + subconnector = bridge->subtype; + } #ifdef CONFIG_OF if (!drm_bridge_get_next_bridge(bridge) && @@ -399,6 +403,33 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, if (panel_bridge) drm_panel_bridge_set_orientation(connector, panel_bridge); + if (connector_type == DRM_MODE_CONNECTOR_DisplayPort) { + drm_connector_attach_dp_subconnector_property(connector, subconnector); + } else if (connector_type == DRM_MODE_CONNECTOR_DVII) { + ret = drm_mode_create_dvi_i_properties(drm); + if (ret) + return ERR_PTR(ret); + + drm_object_attach_property(&connector->base, + drm->mode_config.dvi_i_subconnector_property, + subconnector); + } else if (connector_type == DRM_MODE_CONNECTOR_TV) { + ret = drm_mode_create_tv_properties(drm, + BIT(DRM_MODE_TV_MODE_NTSC) | + BIT(DRM_MODE_TV_MODE_NTSC_443) | + BIT(DRM_MODE_TV_MODE_NTSC_J) | + BIT(DRM_MODE_TV_MODE_PAL) | + BIT(DRM_MODE_TV_MODE_PAL_M) | + BIT(DRM_MODE_TV_MODE_PAL_N) | + BIT(DRM_MODE_TV_MODE_SECAM)); + if (ret) + return ERR_PTR(ret); + + drm_object_attach_property(&connector->base, + drm->mode_config.tv_subconnector_property, + subconnector); + } + return connector; } EXPORT_SYMBOL_GPL(drm_bridge_connector_init); diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index bf964cdfb330..68b14ac5ac0d 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -739,6 +739,10 @@ struct drm_bridge { * identifies the type of connected display. */ int type; + /** + * @subtype: the subtype of the connector for the DP/TV/DVI-I cases. + */ + enum drm_mode_subconnector subtype; /** * @interlace_allowed: Indicate that the bridge can handle interlaced * modes. From patchwork Sat Jul 29 00:49:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 128039 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp902449vqg; Sat, 29 Jul 2023 00:46:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlGBpA029yzheUNh/dEfdt5jKUAzkvNf97cvvZtCEVbHWABSyeUOsinetLMkdGsN0pBj1dTf X-Received: by 2002:a05:6a20:415:b0:137:2213:9495 with SMTP id a21-20020a056a20041500b0013722139495mr3723104pza.58.1690616808759; Sat, 29 Jul 2023 00:46:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690616808; cv=none; d=google.com; s=arc-20160816; b=Kpb0Nd7TnK81G/d+dPYUqApW75MQSSdnfCdIglPgJ3z3VXVmR0VZ+nHzisO9rYYyc2 /GmCnAKAAX+xCZmlrYWTuPMiyBHclboyYBMGCD0XegMlqlagIgCMU9nEzAOTqnqa3f/y mz7Us5Jo83/z0XMB7nNOF4oqw2tDckskEt98YxkSVgNXqS0TDIZVkDSey3h/GFcr0nkN tlss1RY5xHJImxzJBhR6O38ncFJmEU45xFa9oe3hfFnf6pTiaHpXn4HqK5qNFlbSnnp8 shxkL5ZgIaB3neoLe72+vWuKGtR0z/PX4VRQYh2acMXgmakQAbGb1iOupldnuaV2wl9S m72g== 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=DeTSuwZPlptjGhIuO9GsGe/aAqJgvkK628OoK+PRdAE=; fh=Ijs4z7asxnxZXSXH1iKU90GjPS2pk4sYIkJQzsSgRPM=; b=IbsmHg9+gOJJ24Zhe2DK6up/Y5CuhyMYatDj8rQMob24yLN+zZHRM2xLrZJxaBqIYD zQ5iHx2KnSXrmZPxQ5bt78KNQTvt8LaCQUdoO/cep1F39YuodfMD4Aw7f6Da+WEErN3D 5e0YRuWg9idiccXQFogblGDIlMA0XgxdFebF2y+NdvFIupuCg3KqKUCYdf4x+2kaPRrU jjXAB4eqYW5w6myLGymd3IskmYnGXn/JesAbmjP6clMREhIpsCy5J1kx3INh/skp7Dmb URf/fn+EYrKJjs7rKiecqDOrIEMecKu+8yqXpSor6mFdavAqyzjLiNrQbe8vN+a+YfFA wDqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VsttY5+S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n7-20020a6543c7000000b00543e36736d3si2596348pgp.628.2023.07.29.00.46.35; Sat, 29 Jul 2023 00:46:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VsttY5+S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S235282AbjG2A4c (ORCPT + 99 others); Fri, 28 Jul 2023 20:56:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233628AbjG2A4O (ORCPT ); Fri, 28 Jul 2023 20:56:14 -0400 Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4760E4B for ; Fri, 28 Jul 2023 17:55:16 -0700 (PDT) Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2b72161c6e9so49331801fa.0 for ; Fri, 28 Jul 2023 17:55:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690591757; x=1691196557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DeTSuwZPlptjGhIuO9GsGe/aAqJgvkK628OoK+PRdAE=; b=VsttY5+SOr9fF9DKFAkD1fpnsZIU2pLzIzH48JAnNTF5WLWlpLyduf34wSQbvaNWAb q0T98HLRjion0v+Y7GwNdbH2nO50r6azAiH0r5Frq1ZaCCH8lItorpS6m2+vQR62eH9A yCcuwR3l9OiBfirFtuZ7x38cXj0lPnJHQNKLKigfGi84TTJgUD4g3GhZP3EK0oE51Ey5 dYiVwpdI8VzxFLpdaBvu+EZApctr+dAKbxBXZzNoF5/W7MeqLK177oiDz4ESd7tEX8gi 2Otd6PUFptJhMXbFJrehHaYdH0YZ4JJ8iqOxiPYAmbgnXuoHCYlwShe9sd7G0vTI7HkK PLWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690591757; x=1691196557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DeTSuwZPlptjGhIuO9GsGe/aAqJgvkK628OoK+PRdAE=; b=L/TCQGxcppUh2evyxmK0XKE8Xo+IFhUmjELwv0xLHcdXBuAvqXWbsu8qqPVMS/F+3T 5gKSRJEuaMvyxShZarvfQ2JX/VMc/2IOqG2ajmq8oKy91p82qZ48Lx5Qiw0gapXytOaJ O2isQfV09/HB+mw9F9LgPkZnl1uK64EJsRwnbKXYV3qLQm3CpGw8fMNKW1+zUAnVZZpt lWSetDCZywaeBn0By8WJPizSEdWUsfvfae8XRS0gMg0JZllq2SvR0sEx6XFPeDMgOBeX dQkQt6E5WCWURMX98z+hNU6hVhJ3WYbFMEKPZFaGiCR3PKegOUX9QE99hWPntWFZGtL2 bXXQ== X-Gm-Message-State: ABy/qLa+gV/oaMthAYUpt8O7YPpSvZrjvOY5Lajrxd+B1CyPKobCJJ62 FlsYZH21lNYwM3AkMLZtM6iIRQ== X-Received: by 2002:a05:6512:2825:b0:4f8:6d9d:abe0 with SMTP id cf37-20020a056512282500b004f86d9dabe0mr1946529lfb.33.1690591756849; Fri, 28 Jul 2023 17:49:16 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id a24-20020a19f818000000b004fe20d1b288sm500702lff.159.2023.07.28.17.49.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 17:49:16 -0700 (PDT) From: Dmitry Baryshkov To: David Airlie , Daniel Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Andy Gross , Bjorn Andersson , Konrad Dybcio , Simon Ser , Janne Grunau Cc: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , Harry Wentland , Leo Li , Rodrigo Siqueira , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 3/4] drm/uapi: document the USB subconnector type Date: Sat, 29 Jul 2023 03:49:12 +0300 Message-Id: <20230729004913.215872-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230729004913.215872-1-dmitry.baryshkov@linaro.org> References: <20230729004913.215872-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772740210610081641 X-GMAIL-MSGID: 1772740210610081641 To properly define the USB-C DP altmode connectors, add the USB subconnector type. Suggested-by: Simon Ser Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/drm_connector.c | 1 + include/uapi/drm/drm_mode.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index a6066e4a5e9a..9e96b038f5d0 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1050,6 +1050,7 @@ static const struct drm_prop_enum_list drm_dp_subconnector_enum_list[] = { { DRM_MODE_SUBCONNECTOR_DisplayPort, "DP" }, /* DP */ { DRM_MODE_SUBCONNECTOR_Wireless, "Wireless" }, /* DP */ { DRM_MODE_SUBCONNECTOR_Native, "Native" }, /* DP */ + { DRM_MODE_SUBCONNECTOR_USB, "USB" }, /* DP */ }; DRM_ENUM_NAME_FN(drm_get_dp_subconnector_name, diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 92d96a2b6763..0f74918b011c 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -398,6 +398,7 @@ enum drm_mode_subconnector { DRM_MODE_SUBCONNECTOR_HDMIA = 11, /* DP */ DRM_MODE_SUBCONNECTOR_Native = 15, /* DP */ DRM_MODE_SUBCONNECTOR_Wireless = 18, /* DP */ + DRM_MODE_SUBCONNECTOR_USB = 20, /* DP */ }; #define DRM_MODE_CONNECTOR_Unknown 0 From patchwork Sat Jul 29 00:49:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 127955 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp794399vqg; Fri, 28 Jul 2023 18:47:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlH5CRTcFUnw6NLFobhbA96t47FMkP3qXt0ZnLlsjHlJNkJfOd0Uk8yqIKfH5Xv7wPKSIG8s X-Received: by 2002:a17:902:e808:b0:1bb:a4db:9466 with SMTP id u8-20020a170902e80800b001bba4db9466mr4113287plg.4.1690595261491; Fri, 28 Jul 2023 18:47:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690595261; cv=none; d=google.com; s=arc-20160816; b=eUl75JXwEOIrfkpdVKvtUpfH+6omFXsPoksuTxWxRpNsVZeBSHSOPaa8G43DBqQ1Cn 5P39iv+MyWRYarFrBvEhnLi2cN4B/CfWajBcwJ4eZyi9qPfBfBHDk3nBe8psWlJnF7WJ i3oWpLDDPihCKBEsKggsId8kQYtuchmxm7d0whq5BFFNkMLV5rm2VV5leRHwZM+uueWE UIhUYNaUz4mgX7m8b0IZmTl1m+/Bh31BPyvG9t0Z16rj3BY5M38g0fwF9SnMR8maTyhW jcb62TXDZlcQU54MMElueYb7+rx2VBr3edZkXoRdDmr6brYWK1BDs3v/hKvkmUoHbXJK XwZQ== 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=Z4eWv/RBKDrUWJz/NgxgnDtpmPraqNg6YmnPUdo6m2g=; fh=Ijs4z7asxnxZXSXH1iKU90GjPS2pk4sYIkJQzsSgRPM=; b=pYf1SFE4thWqXg6+Ii6KkJV9vONP0nocT1E45tG9a916CT3DpacQ/q/ktBhi2pY7Cq 4of5OW/PlftzurhWTUBNBwFHm02J3jnR2wdZJNjHr7r1I1eBDmCXDmdLMwTNH6TjpC4v Jyei/66BfNof82UprLE+JaJry3nxSunDtcl9No2xvTm7jRbWXtUVpE8wn8W5ewVB9DTV AkhYyFpqzGCXz3xhq6L3TO3gm1SUOPTfG5XTrwuKq7N18/WMI9KJVNpjlXz/ZLCADAid fUFpcGC4g71tfosh1q8ssQ1pMXwb4zDW885RsLG1886j11JpLjfwjoqUINtzT6CpUzxs XvJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tZXrNe4k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e15-20020a17090301cf00b001ac6d4e1d72si3904038plh.149.2023.07.28.18.47.28; Fri, 28 Jul 2023 18:47:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tZXrNe4k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S236527AbjG2BCP (ORCPT + 99 others); Fri, 28 Jul 2023 21:02:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234533AbjG2BCM (ORCPT ); Fri, 28 Jul 2023 21:02:12 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9878146A0 for ; Fri, 28 Jul 2023 18:01:43 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3fbc1218262so28493635e9.3 for ; Fri, 28 Jul 2023 18:01:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690592477; x=1691197277; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z4eWv/RBKDrUWJz/NgxgnDtpmPraqNg6YmnPUdo6m2g=; b=tZXrNe4kyHtOvMEtLQCwLLbJg9HJMiZbGb4FthsmckYksh3vu9QnA3k8F6HufFJiGL LhUMFMlg/oFQlQiNwFluSE5/Ofw/bEyMXqbXYmghKzp0qDMpah0dcGL+sfxn4QqQeSCk 29be46tHx1/NfnsdlBuGG3Gfydzc9xCbx4GQ4sfa86CSl1TdxzVggNEdb/MUmiZS8ZNz Om+7WfaWp3gQr07WrA4BY3WoGlVsU521B/xg1P68eG3i9QnQg5d4gDrqogOBNAKtf33h acy/1/lIo++diRXtQ+VA5Ei/89yxknDlG9TNEkg4v20dfjuDhx8o6pu0kxIBlavp57/l s+pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690592477; x=1691197277; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z4eWv/RBKDrUWJz/NgxgnDtpmPraqNg6YmnPUdo6m2g=; b=l16H0aex73AZ26Vtgpr/sRkP7mD/ZmbObJleThjROY9J39Cs/4PD2aGFHndPOoFC/s OVSyIvaNGCTJaNdJGnDb2Y5RGmoRjZxn7SSoMK0VSmsqq8O7QAN0ataA7xCz3rXTM54O UD5JMeNuwV9JB12fpC1oLsbxgLqXPRrPnSyuP1f+20L1554jg/WxEmrOFKhWd9iyCxyA HEZjpiWmR55C0yQ9sloWaUv7xkvvNG4QlDQRcJa+Ei83+5lHqciHZ/FlMzhxK6Z/+BoW FjHOtojr0BFQbTaUoJXfRnaLT4VArTSyjdATD878sxj3ETlz7eYwrYC6aWG5R52mk/Zx voJQ== X-Gm-Message-State: ABy/qLaNSUK6T5bwIbYpUsTJjl/rbuFM1pVnXXsZRJkjL2XhJ8KwxCIE WzB6wq1FkFqWn+W1ZNMXfL2zFwE6+KPb5pVFmf4= X-Received: by 2002:a19:ca15:0:b0:4fe:ee7:a32a with SMTP id a21-20020a19ca15000000b004fe0ee7a32amr2516420lfg.16.1690591757890; Fri, 28 Jul 2023 17:49:17 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id a24-20020a19f818000000b004fe20d1b288sm500702lff.159.2023.07.28.17.49.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 17:49:17 -0700 (PDT) From: Dmitry Baryshkov To: David Airlie , Daniel Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Andy Gross , Bjorn Andersson , Konrad Dybcio , Simon Ser , Janne Grunau Cc: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , Harry Wentland , Leo Li , Rodrigo Siqueira , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 4/4] soc: qcom: pmic_glink: properly describe the DP connector Date: Sat, 29 Jul 2023 03:49:13 +0300 Message-Id: <20230729004913.215872-5-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230729004913.215872-1-dmitry.baryshkov@linaro.org> References: <20230729004913.215872-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772717617168449143 X-GMAIL-MSGID: 1772717617168449143 During the discussion of the DP connectors, it was suggested that USB-C DisplayPort connectors should have DRM_MODE_CONNECTOR_DisplayPort connector type. This follows the example provided by other drivers (AMDGPU, Intel). To distinguish them from native DP ports, they should have the freshly defined USB as a subconnector type. Suggested-by: Simon Ser Cc: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/pmic_glink_altmode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/soc/qcom/pmic_glink_altmode.c b/drivers/soc/qcom/pmic_glink_altmode.c index 1dedacc52aea..9094944c6cc0 100644 --- a/drivers/soc/qcom/pmic_glink_altmode.c +++ b/drivers/soc/qcom/pmic_glink_altmode.c @@ -417,7 +417,8 @@ static int pmic_glink_altmode_probe(struct auxiliary_device *adev, alt_port->bridge.funcs = &pmic_glink_altmode_bridge_funcs; alt_port->bridge.of_node = to_of_node(fwnode); alt_port->bridge.ops = DRM_BRIDGE_OP_HPD; - alt_port->bridge.type = DRM_MODE_CONNECTOR_USB; + alt_port->bridge.type = DRM_MODE_CONNECTOR_DisplayPort; + alt_port->bridge.subtype = DRM_MODE_SUBCONNECTOR_USB; ret = devm_drm_bridge_add(dev, &alt_port->bridge); if (ret)