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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 9FB19C2D0C2 for ; Tue, 31 Dec 2019 10:26:02 +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 78B13206DA for ; Tue, 31 Dec 2019 10:26:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 78B13206DA 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 23DAB6E201; Tue, 31 Dec 2019 10:26:02 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id E84F86E201 for ; Tue, 31 Dec 2019 10:26:00 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Dec 2019 02:26:00 -0800 X-IronPort-AV: E=Sophos;i="5.69,379,1571727600"; d="scan'208";a="209263587" Received: from heer-mobl.ger.corp.intel.com (HELO localhost) ([10.252.51.86]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Dec 2019 02:25:58 -0800 From: Jani Nikula To: Lucas De Marchi , intel-gfx@lists.freedesktop.org In-Reply-To: <87o8volrla.fsf@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20191223195850.25997-1-lucas.demarchi@intel.com> <20191223195850.25997-7-lucas.demarchi@intel.com> <87o8volrla.fsf@intel.com> Date: Tue, 31 Dec 2019 12:26:14 +0200 Message-ID: <87lfqslrjt.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH 6/9] drm/i915/display: description-based initialization for remaining ddi platforms 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, 31 Dec 2019, Jani Nikula wrote: > On Mon, 23 Dec 2019, Lucas De Marchi wrote: >> Support remaining platforms under HAS_DDI() by providing a slightly more >> complex is_port_present() hook. The downside is that now we call >> I915_READ(SFUSE_STRAP) for each port being initialized, but that's only >> on initialization: a few more mmio reads won't hurt. >> >> Alternatives would be to provide one hook per port, or to have a >> "pre_init()" hook that takes care of the mmio read. However I think this >> is simpler - we may need to adapt if future platforms don't follow the >> same initialization "template". > > All of this really makes me wonder if we end up being *more* complicated > overall by trying very hard to make this generic, when, in reality, it > doesn't seem to be all that generic. > > As I said, two relatively low hanging improvements would be a) moving > VBT specific hacks to intel_bios.c and b) adding port mask to > intel_device_info. Those two alone would go a long way in simplifying > intel_setup_outputs(). > >> >> Signed-off-by: Lucas De Marchi >> --- >> drivers/gpu/drm/i915/display/intel_display.c | 72 +++++++++++++------- >> 1 file changed, 46 insertions(+), 26 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c >> index 6b4d320ff92c..ad85cf75c815 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display.c >> +++ b/drivers/gpu/drm/i915/display/intel_display.c >> @@ -16246,6 +16246,34 @@ static bool icl_is_port_present(struct drm_i915_private *i915, >> intel_bios_is_port_present(i915, PORT_F); >> } >> >> +static bool ddi_is_port_present(struct drm_i915_private *i915, >> + const struct intel_ddi_port_info *port_info) >> +{ >> + /* keep I915_READ() happy */ > > Display could get rid of I915_READ and I915_WRITE after > https://patchwork.freedesktop.org/series/70298/ ... > > BR, > Jani. > >> + struct drm_i915_private *dev_priv = i915; >> + >> + if (port_info->port == PORT_A) >> + return I915_READ(DDI_BUF_CTL(PORT_A)) >> + & DDI_INIT_DISPLAY_DETECTED; >> + >> + if (port_info->port == PORT_E) >> + return IS_GEN9_BC(dev_priv) && >> + intel_bios_is_port_present(i915, PORT_E); >> + >> + switch (port_info->port) { >> + case PORT_B: >> + return I915_READ(SFUSE_STRAP) & SFUSE_STRAP_DDIB_DETECTED; >> + case PORT_C: >> + return I915_READ(SFUSE_STRAP) & SFUSE_STRAP_DDIC_DETECTED; >> + case PORT_D: >> + return I915_READ(SFUSE_STRAP) & SFUSE_STRAP_DDID_DETECTED; >> + case PORT_F: >> + return I915_READ(SFUSE_STRAP) & SFUSE_STRAP_DDIF_DETECTED; >> + default: >> + return false; >> + } >> +} >> + >> static const struct intel_output tgl_output = { >> .dsi_init = icl_dsi_init, >> .ddi_ports = { >> @@ -16296,11 +16324,24 @@ static const struct intel_output gen9lp_output = { >> }, >> }; >> >> +static const struct intel_output ddi_output = { >> + .is_port_present = ddi_is_port_present, >> + .ddi_ports = { >> + { .port = PORT_A }, >> + { .port = PORT_B }, >> + { .port = PORT_C }, >> + { .port = PORT_D }, >> + { .port = PORT_E }, >> + { .port = PORT_F }, >> + { .port = PORT_NONE } >> + } >> +}; >> + >> /* >> * Use a description-based approach for platforms that can be supported with a >> * static table >> */ >> -static void setup_ddi_outputs_desc(struct drm_i915_private *i915) >> +static void setup_ddi_outputs(struct drm_i915_private *i915) >> { >> const struct intel_output *output; >> const struct intel_ddi_port_info *port_info; >> @@ -16313,6 +16354,8 @@ static void setup_ddi_outputs_desc(struct drm_i915_private *i915) >> output = &icl_output; >> else if (IS_GEN9_LP(i915)) >> output = &gen9lp_output; >> + else >> + output = &ddi_output; >> >> for (port_info = output->ddi_ports; >> port_info->port != PORT_NONE; port_info++) { >> @@ -16338,35 +16381,12 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) >> return; >> >> if (INTEL_GEN(dev_priv) >= 11 || IS_GEN9_LP(dev_priv)) { >> - setup_ddi_outputs_desc(dev_priv); >> + setup_ddi_outputs(dev_priv); >> } else if (HAS_DDI(dev_priv)) { >> - int found; >> - >> if (intel_ddi_crt_present(dev_priv)) >> intel_crt_init(dev_priv); PS. You still need stuff like this after the supposedly generic output setup... >> >> - found = I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_INIT_DISPLAY_DETECTED; >> - if (found) >> - intel_ddi_init(dev_priv, PORT_A); >> - >> - /* DDI B, C, D, and F detection is indicated by the SFUSE_STRAP >> - * register */ >> - found = I915_READ(SFUSE_STRAP); >> - >> - if (found & SFUSE_STRAP_DDIB_DETECTED) >> - intel_ddi_init(dev_priv, PORT_B); >> - if (found & SFUSE_STRAP_DDIC_DETECTED) >> - intel_ddi_init(dev_priv, PORT_C); >> - if (found & SFUSE_STRAP_DDID_DETECTED) >> - intel_ddi_init(dev_priv, PORT_D); >> - if (found & SFUSE_STRAP_DDIF_DETECTED) >> - intel_ddi_init(dev_priv, PORT_F); >> - /* >> - * 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)) >> - intel_ddi_init(dev_priv, PORT_E); >> + setup_ddi_outputs(dev_priv); >> } else if (HAS_PCH_SPLIT(dev_priv)) { >> int 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