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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 2041CC433B4 for ; Wed, 28 Apr 2021 07:02:54 +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 82B80610F7 for ; Wed, 28 Apr 2021 07:02:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 82B80610F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 9FBE46EAA6; Wed, 28 Apr 2021 07:02:52 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id F1D3D6EAA6 for ; Wed, 28 Apr 2021 07:02:51 +0000 (UTC) IronPort-SDR: LrRYvjWYtMPU/kktpKrl79VMqYriUAou/twC2CEBu9XU32cHWylRjzYu0tEwXO8GFQdaxKjzJ+ 3fHtu2YMiSRg== X-IronPort-AV: E=McAfee;i="6200,9189,9967"; a="196784214" X-IronPort-AV: E=Sophos;i="5.82,257,1613462400"; d="scan'208";a="196784214" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2021 00:02:50 -0700 IronPort-SDR: 4ALFeU05YEVE29gRsArhNhzcelH5jSW2Hjm1mHUdoOmGCZTXAUve80kEpLctloWazQ07+0MYVp PrS2ft3+z0EA== X-IronPort-AV: E=Sophos;i="5.82,257,1613462400"; d="scan'208";a="430158611" Received: from ajalsove-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.39.247]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2021 00:02:48 -0700 From: Jani Nikula To: Lucas De Marchi , intel-gfx@lists.freedesktop.org In-Reply-To: <20210427230756.2847495-5-lucas.demarchi@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210427230756.2847495-1-lucas.demarchi@intel.com> <20210427230756.2847495-5-lucas.demarchi@intel.com> Date: Wed, 28 Apr 2021 10:02:45 +0300 Message-ID: <87lf9251t6.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH v2 4/4] drm/i915/display: hide workaround for broken vbt in intel_bios.c 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 Tue, 27 Apr 2021, Lucas De Marchi wrote: > Instead of poluting the normal code path in intel_display.c, make > intel_bios.c handle the brokenness of the VBT. > > Signed-off-by: Lucas De Marchi > --- > drivers/gpu/drm/i915/display/intel_bios.c | 15 +++++++++++++++ > drivers/gpu/drm/i915/display/intel_display.c | 14 ++------------ > 2 files changed, 17 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > index befab891a6b9..e9f828452412 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -1852,6 +1852,14 @@ intel_bios_encoder_supports_edp(const struct intel_bios_encoder_data *devdata) > devdata->child.device_type & DEVICE_TYPE_INTERNAL_CONNECTOR; > } > > +static bool skip_broken_vbt(struct drm_i915_private *i915, enum port port) > +{ > + if (port == PORT_F && (IS_ICELAKE(i915) || IS_CANNONLAKE(i915))) > + return !IS_ICL_WITH_PORT_F(i915) && !IS_CNL_WITH_PORT_F(i915); > + > + return false; > +} > + > static void parse_ddi_port(struct drm_i915_private *i915, > struct intel_bios_encoder_data *devdata) > { > @@ -1865,6 +1873,13 @@ static void parse_ddi_port(struct drm_i915_private *i915, > if (port == PORT_NONE) > return; > > + if (skip_broken_vbt(i915, port)) { > + drm_dbg_kms(&i915->drm, > + "VBT reports port %c as supported, but that can't be true: skipping\n", > + port_name(port)); > + return; > + } > + > info = &i915->vbt.ddi_port_info[port]; > > if (info->devdata) { > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 55f8f2ceada2..64a2a3b9a480 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -10868,15 +10868,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) > intel_ddi_init(dev_priv, PORT_C); > intel_ddi_init(dev_priv, PORT_D); > intel_ddi_init(dev_priv, PORT_E); > - > - /* > - * On some ICL SKUs port F is not present, but broken VBTs mark > - * the port as present. Only try to initialize port F for the > - * SKUs that may actually have it. > - */ > - if (IS_ICL_WITH_PORT_F(dev_priv)) > - intel_ddi_init(dev_priv, PORT_F); > - > + intel_ddi_init(dev_priv, PORT_F); > icl_dsi_init(dev_priv); > } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) { > intel_ddi_init(dev_priv, PORT_A); > @@ -10889,9 +10881,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) > intel_ddi_init(dev_priv, PORT_C); > intel_ddi_init(dev_priv, PORT_D); > intel_ddi_init(dev_priv, PORT_E); > - > - if (IS_CNL_WITH_PORT_F(dev_priv)) > - intel_ddi_init(dev_priv, PORT_F); > + intel_ddi_init(dev_priv, PORT_E); Whoops, not PORT_E, but I guess you noticed. :) > } else if (HAS_DDI(dev_priv)) { > u32 found; -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx