From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB8BDC433E2 for ; Tue, 1 Sep 2020 07:24:09 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 88FC920684 for ; Tue, 1 Sep 2020 07:24:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 88FC920684 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E93B6E5B9; Tue, 1 Sep 2020 07:24:06 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id E03D96E5A1; Tue, 1 Sep 2020 07:24:04 +0000 (UTC) IronPort-SDR: 1aUhd0/pAnICW74Z22V/LW+aB3XtBT1Ogge5bTbZ3t4c72gzvgWDOC/LOKgBwepIizmEnPcUtD D30xtjc0TSfg== X-IronPort-AV: E=McAfee;i="6000,8403,9730"; a="241933104" X-IronPort-AV: E=Sophos;i="5.76,378,1592895600"; d="scan'208";a="241933104" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2020 00:24:04 -0700 IronPort-SDR: aWhZmg6OP5DahhOjE2IomRafNii35pBqe3o8jA0d8hk9kWmGYJ1jcQfwU/H5xBKIcIIKI1edS8 GEc6C2hw998Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,378,1592895600"; d="scan'208";a="325242108" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga004.fm.intel.com with ESMTP; 01 Sep 2020 00:24:04 -0700 Received: from bgsmsx601.gar.corp.intel.com (10.109.78.80) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 1 Sep 2020 00:23:21 -0700 Received: from kmsmsx601.gar.corp.intel.com (172.21.219.141) by BGSMSX601.gar.corp.intel.com (10.109.78.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 1 Sep 2020 12:53:18 +0530 Received: from kmsmsx601.gar.corp.intel.com ([172.21.219.141]) by kmsmsx601.gar.corp.intel.com ([172.21.219.141]) with mapi id 15.01.1713.004; Tue, 1 Sep 2020 15:23:18 +0800 From: "B, Jeevan" To: "nouveau@lists.freedesktop.org" , "intel-gfx@lists.freedesktop.org" , "dri-devel@lists.freedesktop.org" Thread-Topic: [v3] drm/nouveau: utilize subconnector property for DP Thread-Index: AQHWc5m07vIwWA6ZzUWq9Zq07STQmalTc/1Q Date: Tue, 1 Sep 2020 07:23:18 +0000 Message-ID: <9054960bbd2e45129204acf5f55ed79c@intel.com> References: <1587732655-17544-3-git-send-email-jeevan.b@intel.com> <1597560705-13897-1-git-send-email-jeevan.b@intel.com> In-Reply-To: <1597560705-13897-1-git-send-email-jeevan.b@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows x-originating-ip: [10.223.10.1] MIME-Version: 1.0 Subject: Re: [Intel-gfx] [v3] drm/nouveau: utilize subconnector property for DP X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Nikula, Jani" , Oleg Vasilev , "bskeggs@redhat.com" , "airlied@redhat.com" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi Ben Skeggs, Gentle Reminder, Can you please take a look at the patch and provide your ack. Thanks Jeevan B >-----Original Message----- >From: B, Jeevan >Sent: Sunday, August 16, 2020 12:22 PM >To: nouveau@lists.freedesktop.org; intel-gfx@lists.freedesktop.org; dri- >devel@lists.freedesktop.org >Cc: bskeggs@redhat.com; airlied@redhat.com; >maarten.lankhorst@linux.intel.com; Nikula, Jani ; >Shankar, Uma ; Oleg Vasilev >; B, Jeevan >Subject: [v3] drm/nouveau: utilize subconnector property for DP > >From: Oleg Vasilev > >Since DP-specific information is stored in driver's structures, every driver >needs to implement subconnector property by itself. > >v2: rebase > >v3: renamed a function call > >Cc: Ben Skeggs >Cc: nouveau@lists.freedesktop.org >Signed-off-by: Jeevan B >Signed-off-by: Oleg Vasilev >Reviewed-by: Emil Velikov >--- > drivers/gpu/drm/nouveau/nouveau_connector.c | 13 +++++++++++++ > drivers/gpu/drm/nouveau/nouveau_dp.c | 9 +++++++++ > drivers/gpu/drm/nouveau/nouveau_encoder.h | 1 + > 3 files changed, 23 insertions(+) > >diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c >b/drivers/gpu/drm/nouveau/nouveau_connector.c >index 7674025..955afed 100644 >--- a/drivers/gpu/drm/nouveau/nouveau_connector.c >+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c >@@ -654,6 +654,17 @@ nouveau_connector_detect(struct drm_connector >*connector, bool force) > pm_runtime_mark_last_busy(dev->dev); > pm_runtime_put_autosuspend(dev->dev); > >+ if (connector->connector_type == >DRM_MODE_CONNECTOR_DisplayPort || >+ connector->connector_type == DRM_MODE_CONNECTOR_eDP) { >+ enum drm_mode_subconnector subconnector = >+DRM_MODE_SUBCONNECTOR_Unknown; >+ >+ if (conn_status == connector_status_connected && >nv_encoder) >+ subconnector = nv_encoder->dp.subconnector; >+ drm_object_property_set_value(&connector->base, >+ connector->dev- >>mode_config.dp_subconnector_property, >+ subconnector); >+ } >+ > return conn_status; > } > >@@ -1390,6 +1401,8 @@ nouveau_connector_create(struct drm_device *dev, > kfree(nv_connector); > return ERR_PTR(ret); > } >+ >+ > drm_connector_attach_dp_subconnector_property(connector); > funcs = &nouveau_connector_funcs; > break; > default: >diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c >b/drivers/gpu/drm/nouveau/nouveau_dp.c >index 8a0f799..3eff884 100644 >--- a/drivers/gpu/drm/nouveau/nouveau_dp.c >+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c >@@ -62,6 +62,7 @@ nouveau_dp_detect(struct nouveau_encoder >*nv_encoder) > struct nouveau_drm *drm = nouveau_drm(dev); > struct nvkm_i2c_aux *aux; > u8 dpcd[8]; >+ u8 port_cap[DP_MAX_DOWNSTREAM_PORTS] = {}; > int ret; > > aux = nv_encoder->aux; >@@ -72,6 +73,14 @@ nouveau_dp_detect(struct nouveau_encoder >*nv_encoder) > if (ret) > return ret; > >+ if (dpcd[DP_DPCD_REV] > 0x10) { >+ ret = nvkm_rdaux(aux, DP_DOWNSTREAM_PORT_0, >+ port_cap, DP_MAX_DOWNSTREAM_PORTS); >+ if (ret) >+ memset(port_cap, 0, >DP_MAX_DOWNSTREAM_PORTS); >+ } >+ nv_encoder->dp.subconnector = drm_dp_subconnector_type(dpcd, >+port_cap); >+ > nv_encoder->dp.link_bw = 27000 * dpcd[1]; > nv_encoder->dp.link_nr = dpcd[2] & DP_MAX_LANE_COUNT_MASK; > >diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h >b/drivers/gpu/drm/nouveau/nouveau_encoder.h >index a72c412..49b5c10 100644 >--- a/drivers/gpu/drm/nouveau/nouveau_encoder.h >+++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h >@@ -64,6 +64,7 @@ struct nouveau_encoder { > struct nv50_mstm *mstm; > int link_nr; > int link_bw; >+ enum drm_mode_subconnector subconnector; > } dp; > }; > >-- >2.7.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx