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 9D43BC2D0C2 for ; Tue, 31 Dec 2019 11:22:16 +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 73C21206DB for ; Tue, 31 Dec 2019 11:22:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 73C21206DB 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 088B06E210; Tue, 31 Dec 2019 11:22:16 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 52EF76E210 for ; Tue, 31 Dec 2019 11:22:14 +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 fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Dec 2019 03:22:13 -0800 X-IronPort-AV: E=Sophos;i="5.69,379,1571727600"; d="scan'208";a="213608306" 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 03:22:11 -0800 From: Jani Nikula To: Lucas De Marchi , intel-gfx@lists.freedesktop.org In-Reply-To: <20191223195850.25997-10-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-10-lucas.demarchi@intel.com> Date: Tue, 31 Dec 2019 13:22:25 +0200 Message-ID: <87a778loy6.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH 9/9] drm/i915/display: use port_info on 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: , 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: > Now that we have tables for all platforms using ddi, keep the port_info > around so we can use it for decisions like "what phy does it have?" > instead of keep checking the platform/gen everywhere. > > Signed-off-by: Lucas De Marchi > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 36 ++++++++++++------- > drivers/gpu/drm/i915/display/intel_ddi.h | 8 ++++- > drivers/gpu/drm/i915/display/intel_display.c | 2 +- > .../drm/i915/display/intel_display_types.h | 3 ++ > 4 files changed, 35 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index a1b7075ea6be..9d06a34f5f8e 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -4782,14 +4782,25 @@ intel_ddi_max_lanes(struct intel_digital_port *dig_port) > return max_lanes; > } > > -void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) > +bool __pure intel_ddi_has_tc_phy(const struct intel_digital_port *dig_port) Nitpick, I think __pure is premature optimization that may cause more confusion than it benefits. Also, 'git grep __pure -- drivers | wc -l'. BR, Jani. > { > + return dig_port->port_info->phy_type == PHY_TYPE_TC; > +} > + > +bool __pure intel_ddi_has_combo_phy(const struct intel_digital_port *dig_port) > +{ > + return dig_port->port_info->phy_type == PHY_TYPE_COMBO; > +} > + > +void intel_ddi_init(struct drm_i915_private *dev_priv, > + const struct intel_ddi_port_info *port_info) > +{ > + enum port port = port_info->port; > struct ddi_vbt_port_info *vbt_port_info = > &dev_priv->vbt.ddi_port_info[port]; > struct intel_digital_port *intel_dig_port; > struct intel_encoder *encoder; > bool init_hdmi, init_dp, init_lspcon = false; > - enum phy phy = intel_port_to_phy(dev_priv, port); > > init_hdmi = vbt_port_info->supports_dvi || vbt_port_info->supports_hdmi; > init_dp = vbt_port_info->supports_dp; > @@ -4803,12 +4814,12 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) > init_dp = true; > init_lspcon = true; > init_hdmi = false; > - DRM_DEBUG_KMS("VBT says port %c has lspcon\n", port_name(port)); > + DRM_DEBUG_KMS("VBT says port %s has lspcon\n", port_info->name); > } > > if (!init_dp && !init_hdmi) { > - DRM_DEBUG_KMS("VBT says port %c is not DVI/HDMI/DP compatible, respect it\n", > - port_name(port)); > + DRM_DEBUG_KMS("VBT says %s is not DVI/HDMI/DP compatible, respect it\n", > + port_info->name); > return; > } > > @@ -4819,7 +4830,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) > encoder = &intel_dig_port->base; > > drm_encoder_init(&dev_priv->drm, &encoder->base, &intel_ddi_funcs, > - DRM_MODE_ENCODER_TMDS, "DDI %c", port_name(port)); > + DRM_MODE_ENCODER_TMDS, port_info->name); > > encoder->hotplug = intel_ddi_hotplug; > encoder->compute_output_type = intel_ddi_compute_output_type; > @@ -4837,7 +4848,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) > > encoder->type = INTEL_OUTPUT_DDI; > encoder->power_domain = intel_port_to_power_domain(port); > - encoder->port = port; > + encoder->port = port_info->port; > encoder->cloneable = 0; > encoder->pipe_mask = ~0; > > @@ -4851,8 +4862,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) > intel_dig_port->dp.output_reg = INVALID_MMIO_REG; > intel_dig_port->max_lanes = intel_ddi_max_lanes(intel_dig_port); > intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port); > + intel_dig_port->port_info = port_info; > > - if (intel_phy_is_tc(dev_priv, phy)) { > + if (intel_ddi_has_tc_phy(intel_dig_port)) { > bool is_legacy = !vbt_port_info->supports_typec_usb && > !vbt_port_info->supports_tbt; > > @@ -4883,15 +4895,15 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) > if (init_lspcon) { > if (lspcon_init(intel_dig_port)) > /* TODO: handle hdmi info frame part */ > - DRM_DEBUG_KMS("LSPCON init success on port %c\n", > - port_name(port)); > + DRM_DEBUG_KMS("LSPCON init success on port %s\n", > + port_info->name); > else > /* > * LSPCON init faied, but DP init was success, so > * lets try to drive as DP++ port. > */ > - DRM_ERROR("LSPCON init failed on port %c\n", > - port_name(port)); > + DRM_ERROR("LSPCON init failed on port %s\n", > + port_info->name); > } > > intel_infoframe_init(intel_dig_port); > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.h b/drivers/gpu/drm/i915/display/intel_ddi.h > index 167c6579d972..c500d473963e 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.h > +++ b/drivers/gpu/drm/i915/display/intel_ddi.h > @@ -15,6 +15,7 @@ struct drm_i915_private; > struct intel_connector; > struct intel_crtc; > struct intel_crtc_state; > +struct intel_ddi_port_info; > struct intel_dp; > struct intel_dpll_hw_state; > struct intel_encoder; > @@ -24,7 +25,8 @@ void intel_ddi_fdi_post_disable(struct intel_encoder *intel_encoder, > const struct drm_connector_state *old_conn_state); > void hsw_fdi_link_train(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state); > -void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port); > +void intel_ddi_init(struct drm_i915_private *dev_priv, > + const struct intel_ddi_port_info *port_info); > bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe); > void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state); > void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state); > @@ -50,4 +52,8 @@ void icl_sanitize_encoder_pll_mapping(struct intel_encoder *encoder); > int cnl_calc_wrpll_link(struct drm_i915_private *dev_priv, > struct intel_dpll_hw_state *state); > > + > +bool __pure intel_ddi_has_tc_phy(const struct intel_digital_port *dig_port); > +bool __pure intel_ddi_has_combo_phy(const struct intel_digital_port *dig_port); > + > #endif /* __INTEL_DDI_H__ */ > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 219f180fa395..96207dc83fac 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -16363,7 +16363,7 @@ static void setup_ddi_outputs(struct drm_i915_private *i915) > !output->is_port_present(i915, port_info)) > continue; > > - intel_ddi_init(i915, port_info->port); > + intel_ddi_init(i915, port_info); > } > > if (output->dsi_init) > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index 23a885895803..c54b0178e885 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1346,6 +1346,9 @@ struct intel_digital_port { > enum intel_display_power_domain ddi_io_power_domain; > struct mutex tc_lock; /* protects the TypeC port mode */ > intel_wakeref_t tc_lock_wakeref; > + > + const struct intel_ddi_port_info *port_info; > + > int tc_link_refcount; > bool tc_legacy_port:1; > char tc_port_name[8]; -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx