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,URIBL_BLOCKED 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 6C6AEC433E0 for ; Tue, 16 Feb 2021 19:50:28 +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 1D40864D7F for ; Tue, 16 Feb 2021 19:50:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1D40864D7F 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 93B796E97D; Tue, 16 Feb 2021 19:50:27 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 300016E97D for ; Tue, 16 Feb 2021 19:50:26 +0000 (UTC) IronPort-SDR: 6Qn3h88/NSZX02ImDg3TVN6no4zR+lLapA2ILQF+Rjr+VwpqNLB7i7sc9TFwSjT3YxNCuGPzQY drBXmgU1IVcQ== X-IronPort-AV: E=McAfee;i="6000,8403,9897"; a="183133977" X-IronPort-AV: E=Sophos;i="5.81,184,1610438400"; d="scan'208";a="183133977" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Feb 2021 11:50:10 -0800 IronPort-SDR: TDZur4W9f1N22/UTW4AyBKscdLmyExozB+cWMimOINHZBbwo+LqDqcN/a0O8vBirr5lJ064MFA XU51JEXDadnQ== X-IronPort-AV: E=Sophos;i="5.81,184,1610438400"; d="scan'208";a="399654013" Received: from suvorova-mobl.ccr.corp.intel.com (HELO localhost) ([10.249.36.98]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Feb 2021 11:50:07 -0800 From: Jani Nikula To: Lucas De Marchi In-Reply-To: <20210215162653.sarercr3qcgo5hed@ldmartin-desk1> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210213190511.1017088-1-lucas.demarchi@intel.com> <20210213190511.1017088-2-lucas.demarchi@intel.com> <874kidd3eh.fsf@intel.com> <20210215162653.sarercr3qcgo5hed@ldmartin-desk1> Date: Tue, 16 Feb 2021 21:50:03 +0200 Message-ID: <87sg5vbxn8.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH 1/3] drm/i915/display: move vbt check to intel_ddi_init() 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: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, 15 Feb 2021, Lucas De Marchi wrote: > On Mon, Feb 15, 2021 at 12:35:50PM +0200, Jani Nikula wrote: >>On Sat, 13 Feb 2021, Lucas De Marchi wrote: >>> On intel_ddi_init() we already check VBT if the port supports HDMI/DP >>> and bail out otherwise. Instad of checking if a single port is present >>> using VBT in intel_display.c, move the stronger check to >>> intel_ddi_init() and return early in case it's not supported. There >>> would be no way intel_bios_* would report support for hdmi/dp if the >>> port isn't present so this should cause no regressions for other >>> platforms. >> >>Sorry, but this will regress machines that have no VBT. > > I missed that init_vbt_missing_defaults() also sets > the supports_*. > >> >>I've been thinking about creating fake child devices for that case to >>reduce the exceptions. > > Adding a fake child would indeed be a good option. Are you going to > implement that soon or should I? I'm working on it. Got a bit carried away with what I've had in mind for ages regarding some other refactoring (e.g. getting rid of i915->vbt.ddi_port_info[] altogether in order to bring pre- and post-ddi platforms closer together). I'll try to get a smaller set ready first. BR, Jani. > > thanks > Lucas De Marchi > >> >>BR, >>Jani. >> >> >> >>> >>> Signed-off-by: Lucas De Marchi >>> --- >>> drivers/gpu/drm/i915/display/intel_ddi.c | 7 +++++++ >>> drivers/gpu/drm/i915/display/intel_display.c | 14 ++++++-------- >>> 2 files changed, 13 insertions(+), 8 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c >>> index 3b97c0091812..1235be0ba5d1 100644 >>> --- a/drivers/gpu/drm/i915/display/intel_ddi.c >>> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c >>> @@ -3972,6 +3972,13 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) >>> bool init_hdmi, init_dp; >>> enum phy phy = intel_port_to_phy(dev_priv, port); >>> >>> + if (!intel_bios_is_port_present(dev_priv, port)) { >>> + drm_dbg_kms(&dev_priv->drm, >>> + "VBT says port %c is not present, respect it\n", >>> + port_name(port)); >>> + return; >>> + } >>> + >>> /* >>> * On platforms with HTI (aka HDPORT), if it's enabled at boot it may >>> * have taken over some of the PHYs and made them unavailable to the >>> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c >>> index 23ec68498800..7aaf7a29d493 100644 >>> --- a/drivers/gpu/drm/i915/display/intel_display.c >>> +++ b/drivers/gpu/drm/i915/display/intel_display.c >>> @@ -11904,13 +11904,13 @@ 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. No strap bits for >>> - * this, so rely on VBT. >>> - * Work around broken VBTs on SKUs known to have no port F. >>> + * 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_bios_is_port_present(dev_priv, PORT_F)) >>> + if (IS_ICL_WITH_PORT_F(dev_priv)) >>> intel_ddi_init(dev_priv, PORT_F); >>> >>> icl_dsi_init(dev_priv); >>> @@ -11964,10 +11964,8 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) >>> /* >>> * On SKL we don't have a way to detect DDI-E so we rely on VBT. >>> */ >>> - if (IS_GEN9_BC(dev_priv) && >>> - intel_bios_is_port_present(dev_priv, PORT_E)) >>> + if (IS_GEN9_BC(dev_priv)) >>> intel_ddi_init(dev_priv, PORT_E); >>> - >>> } else if (HAS_PCH_SPLIT(dev_priv)) { >>> int found; >> >>-- >>Jani Nikula, Intel Open Source Graphics Center -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx