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=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 449F7C433E0 for ; Thu, 2 Jul 2020 22:35:26 +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 1B2342075D for ; Thu, 2 Jul 2020 22:35:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B2342075D 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 8D9B56E351; Thu, 2 Jul 2020 22:35:25 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id D9CA26E351 for ; Thu, 2 Jul 2020 22:35:23 +0000 (UTC) IronPort-SDR: EZ086q9dC+wQbnE+R3qqpxOSMQAf0IGgt+RGYmORjfCsjN4Qay5DtHsxBI7wma+e/P2qruBc7E RXWnJpq/l/Lg== X-IronPort-AV: E=McAfee;i="6000,8403,9670"; a="148576462" X-IronPort-AV: E=Sophos;i="5.75,305,1589266800"; d="scan'208";a="148576462" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2020 15:35:22 -0700 IronPort-SDR: 0VyULtKshlVkJ+LkfcnC6aRwVXIWPYtFey3hQx/DPhqhIEqh4t4fAWl9nUrO/P7I3FmnX0fPon kRgIsvLJ8nxQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,305,1589266800"; d="scan'208";a="356595155" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga001.jf.intel.com with ESMTP; 02 Jul 2020 15:35:22 -0700 Received: from fmsmsx116.amr.corp.intel.com ([169.254.2.40]) by fmsmsx107.amr.corp.intel.com ([169.254.6.74]) with mapi id 14.03.0439.000; Thu, 2 Jul 2020 15:34:37 -0700 From: "Souza, Jose" To: "ville.syrjala@linux.intel.com" , "Atwood, Matthew S" , "intel-gfx@lists.freedesktop.org" , "Navare, Manasi D" , "chris@chris-wilson.co.uk" Thread-Topic: [Intel-gfx] [PATCH] Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+" Thread-Index: AQHWUL7BGlZ8UzL/okCwhi0xPV2efaj1VkAA Date: Thu, 2 Jul 2020 22:34:36 +0000 Message-ID: <81c8ff248ea40be27ea51152fcef200c5f3c6a77.camel@intel.com> References: <20200702221818.29094-1-matthew.s.atwood@intel.com> In-Reply-To: <20200702221818.29094-1-matthew.s.atwood@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.24.14.51] Content-ID: MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+" 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, 2020-07-02 at 15:18 -0700, Matt Atwood wrote: > The initial CI results did not include a TGL system which includes a > panel that is having issues with patch. Revert while we triage. > > This reverts commit 680c45c767f63e35f063d3ea04f388a9f7ae7079. Missing the Signed-off-by line also the commit references should follow this format "2850748ef876 ("drm/i915: Pull i915_vma_pin under the vm- >mutex")". Please CC me in the updated version. > --- > drivers/gpu/drm/i915/display/intel_dp.c | 28 +++++++++++++++---------- > 1 file changed, 17 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index a5ab405d3a12..d6295eb20b63 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -137,8 +137,6 @@ static const u8 valid_dsc_slicecount[] = {1, 2, 4}; > * > * If a CPU or PCH DP output is attached to an eDP panel, this function > * will return true, and false otherwise. > - * > - * This function is not safe to use prior to encoder type being set. > */ > bool intel_dp_is_edp(struct intel_dp *intel_dp) > { > @@ -8159,6 +8157,8 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, > intel_encoder->base.name)) > return false; > > + intel_dp_set_source_rates(intel_dp); > + > intel_dp->reset_link_params = true; > intel_dp->pps_pipe = INVALID_PIPE; > intel_dp->active_pipe = INVALID_PIPE; > @@ -8174,22 +8174,28 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, > */ > drm_WARN_ON(dev, intel_phy_is_tc(dev_priv, phy)); > type = DRM_MODE_CONNECTOR_eDP; > - intel_encoder->type = INTEL_OUTPUT_EDP; > - > - /* eDP only on port B and/or C on vlv/chv */ > - if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) || > - IS_CHERRYVIEW(dev_priv)) && > - port != PORT_B && port != PORT_C)) > - return false; > } else { > type = DRM_MODE_CONNECTOR_DisplayPort; > } > > - intel_dp_set_source_rates(intel_dp); > - > if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > intel_dp->active_pipe = vlv_active_pipe(intel_dp); > > + /* > + * For eDP we always set the encoder type to INTEL_OUTPUT_EDP, but > + * for DP the encoder type can be set by the caller to > + * INTEL_OUTPUT_UNKNOWN for DDI, so don't rewrite it. > + */ > + if (type == DRM_MODE_CONNECTOR_eDP) > + intel_encoder->type = INTEL_OUTPUT_EDP; > + > + /* eDP only on port B and/or C on vlv/chv */ > + if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) || > + IS_CHERRYVIEW(dev_priv)) && > + intel_dp_is_edp(intel_dp) && > + port != PORT_B && port != PORT_C)) > + return false; > + > drm_dbg_kms(&dev_priv->drm, > "Adding %s connector on [ENCODER:%d:%s]\n", > type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP", _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx