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 971FAC2D0C2 for ; Tue, 31 Dec 2019 09:58:39 +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 661D6206DB for ; Tue, 31 Dec 2019 09:58:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 661D6206DB 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 DEC706E204; Tue, 31 Dec 2019 09:58:38 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F61B6E204 for ; Tue, 31 Dec 2019 09:58:38 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Dec 2019 01:58:37 -0800 X-IronPort-AV: E=Sophos;i="5.69,378,1571727600"; d="scan'208";a="213590575" Received: from heer-mobl.ger.corp.intel.com (HELO localhost) ([10.252.51.86]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Dec 2019 01:58:35 -0800 From: Jani Nikula To: Lucas De Marchi , intel-gfx@lists.freedesktop.org In-Reply-To: <20191223195850.25997-5-lucas.demarchi@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20191223195850.25997-1-lucas.demarchi@intel.com> <20191223195850.25997-5-lucas.demarchi@intel.com> Date: Tue, 31 Dec 2019 11:58:51 +0200 Message-ID: <87tv5glstg.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH 4/9] drm/i915/display: start description-based ddi initialization 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 Mon, 23 Dec 2019, Lucas De Marchi wrote: > For the latest platforms we can share the logic to initialize the the > ddi, so start moving the most trivial ones to a new setup_outputs_desc() > function that will be responsible for initialization according to a > static const table. > > Signed-off-by: Lucas De Marchi > --- > drivers/gpu/drm/i915/display/intel_display.c | 96 +++++++++++++------ > .../drm/i915/display/intel_display_types.h | 4 + > 2 files changed, 73 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 04819b0bd494..b3fb1e03cb0b 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -16221,6 +16221,72 @@ static void intel_pps_init(struct drm_i915_private *dev_priv) > intel_pps_unlock_regs_wa(dev_priv); > } > > +struct intel_output { > + /* Initialize DSI if present */ > + void (*dsi_init)(struct drm_i915_private *i915); We'll need to be able to initialize DSI on multiple ports too. I've already drafted a series to do so, maybe I've even sent it to the list. Basically you'd pass the port to icl_dsi_init() too. I don't want that development to get any more complicated than it already is. BR, Jani. > + struct intel_ddi_port_info ddi_ports[]; > +}; > + > +static const struct intel_output tgl_output = { > + .dsi_init = icl_dsi_init, > + .ddi_ports = { > + { .port = PORT_A }, > + { .port = PORT_B }, > + { .port = PORT_D }, > + { .port = PORT_E }, > + { .port = PORT_F }, > + { .port = PORT_G }, > + { .port = PORT_H }, > + { .port = PORT_I }, > + { .port = PORT_NONE } > + } > +}; > + > +static const struct intel_output ehl_output = { > + .dsi_init = icl_dsi_init, > + .ddi_ports = { > + { .port = PORT_A }, > + { .port = PORT_B }, > + { .port = PORT_C }, > + { .port = PORT_D }, > + { .port = PORT_NONE } > + } > +}; > + > +static const struct intel_output gen9lp_output = { > + .dsi_init = vlv_dsi_init, > + .ddi_ports = { > + { .port = PORT_A }, > + { .port = PORT_B }, > + { .port = PORT_C }, > + { .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) > +{ > + const struct intel_output *output; > + const struct intel_ddi_port_info *port_info; > + > + if (INTEL_GEN(i915) >= 12) > + output = &tgl_output; > + else if (IS_ELKHARTLAKE(i915)) > + output = &ehl_output; > + else if (IS_GEN9_LP(i915)) > + output = &gen9lp_output; > + > + for (port_info = output->ddi_ports; > + port_info->port != PORT_NONE; port_info++) > + intel_ddi_init(i915, port_info->port); > + > + if (output->dsi_init) > + output->dsi_init(i915); > +} > + > static void intel_setup_outputs(struct drm_i915_private *dev_priv) > { > struct intel_encoder *encoder; > @@ -16231,22 +16297,9 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) > if (!HAS_DISPLAY(dev_priv) || !INTEL_DISPLAY_ENABLED(dev_priv)) > return; > > - if (INTEL_GEN(dev_priv) >= 12) { > - intel_ddi_init(dev_priv, PORT_A); > - intel_ddi_init(dev_priv, PORT_B); > - intel_ddi_init(dev_priv, PORT_D); > - intel_ddi_init(dev_priv, PORT_E); > - intel_ddi_init(dev_priv, PORT_F); > - intel_ddi_init(dev_priv, PORT_G); > - intel_ddi_init(dev_priv, PORT_H); > - intel_ddi_init(dev_priv, PORT_I); > - icl_dsi_init(dev_priv); > - } else if (IS_ELKHARTLAKE(dev_priv)) { > - intel_ddi_init(dev_priv, PORT_A); > - intel_ddi_init(dev_priv, PORT_B); > - intel_ddi_init(dev_priv, PORT_C); > - intel_ddi_init(dev_priv, PORT_D); > - icl_dsi_init(dev_priv); > + if (INTEL_GEN(dev_priv) >= 12 || IS_ELKHARTLAKE(dev_priv) || > + IS_GEN9_LP(dev_priv)) { > + setup_ddi_outputs_desc(dev_priv); > } else if (IS_GEN(dev_priv, 11)) { > intel_ddi_init(dev_priv, PORT_A); > intel_ddi_init(dev_priv, PORT_B); > @@ -16263,17 +16316,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) > intel_ddi_init(dev_priv, PORT_F); > > icl_dsi_init(dev_priv); > - } else if (IS_GEN9_LP(dev_priv)) { > - /* > - * FIXME: Broxton doesn't support port detection via the > - * DDI_BUF_CTL_A or SFUSE_STRAP registers, find another way to > - * detect the ports. > - */ > - intel_ddi_init(dev_priv, PORT_A); > - intel_ddi_init(dev_priv, PORT_B); > - intel_ddi_init(dev_priv, PORT_C); > - > - vlv_dsi_init(dev_priv); > } else if (HAS_DDI(dev_priv)) { > int found; > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index a3a067dacf84..4d2f4ee35812 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1376,6 +1376,10 @@ struct intel_dp_mst_encoder { > struct intel_connector *connector; > }; > > +struct intel_ddi_port_info { > + enum port port; > +}; > + > static inline enum dpio_channel > vlv_dig_port_to_channel(struct intel_digital_port *dig_port) > { -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx