| Message ID | 20200625001120.22810-6-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | display/ddi: keep register indexes in a table | expand |
On Wed, 24 Jun 2020, Lucas De Marchi <lucas.demarchi@intel.com> 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. Reviewed-by: Jani Nikula <jani.nikula@intel.com> > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 39 ++++++++++++------- > 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, 37 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index ca7bb2294d2b..27e2f29f47a2 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -4844,12 +4844,24 @@ intel_ddi_max_lanes(struct intel_digital_port *intel_dport) > return max_lanes; > } > > -void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) > +bool intel_ddi_has_tc_phy(const struct intel_digital_port *dig_port) > { > + return dig_port->port_info->phy_type == PHY_TYPE_MG || > + dig_port->port_info->phy_type == PHY_TYPE_DKL; > +} > + > +bool 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 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 = intel_bios_port_supports_dvi(dev_priv, port) || > intel_bios_port_supports_hdmi(dev_priv, port); > @@ -4864,14 +4876,14 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) > init_dp = true; > init_lspcon = true; > init_hdmi = false; > - drm_dbg_kms(&dev_priv->drm, "VBT says port %c has lspcon\n", > - port_name(port)); > + drm_dbg_kms(&dev_priv->drm, "VBT says port %s has lspcon\n", > + port_info->name); > } > > if (!init_dp && !init_hdmi) { > drm_dbg_kms(&dev_priv->drm, > - "VBT says port %c is not DVI/HDMI/DP compatible, respect it\n", > - port_name(port)); > + "VBT says port %s is not DVI/HDMI/DP compatible, respect it\n", > + port_info->name); > return; > } > > @@ -4882,7 +4894,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; > @@ -4917,8 +4929,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 = > !intel_bios_port_supports_typec_usb(dev_priv, port) && > !intel_bios_port_supports_tbt(dev_priv, port); > @@ -4951,20 +4964,20 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) > if (lspcon_init(intel_dig_port)) > /* TODO: handle hdmi info frame part */ > drm_dbg_kms(&dev_priv->drm, > - "LSPCON init success on port %c\n", > - port_name(port)); > + "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_err(&dev_priv->drm, > - "LSPCON init failed on port %c\n", > - port_name(port)); > + "LSPCON init failed on port %s\n", > + port_info->name); > } > > if (INTEL_GEN(dev_priv) >= 11) { > - if (intel_phy_is_tc(dev_priv, phy)) > + if (intel_ddi_has_tc_phy(intel_dig_port)) > intel_dig_port->connected = intel_tc_port_connected; > else > intel_dig_port->connected = lpt_digital_port_connected; > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.h b/drivers/gpu/drm/i915/display/intel_ddi.h > index 077e9dbbe367..059d87171c81 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.h > +++ b/drivers/gpu/drm/i915/display/intel_ddi.h > @@ -13,6 +13,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; > @@ -23,7 +24,8 @@ void intel_ddi_fdi_post_disable(struct intel_atomic_state *state, > 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(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state); > @@ -46,4 +48,8 @@ int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder, > bool enable); > void icl_sanitize_encoder_pll_mapping(struct intel_encoder *encoder); > > + > +bool intel_ddi_has_tc_phy(const struct intel_digital_port *dig_port); > +bool 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 d591063502c5..001b44c004ab 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -16880,7 +16880,7 @@ static void setup_ddi_outputs_desc(struct drm_i915_private *i915, > if (test_bit(port_info->port, &disable_mask)) > continue; > > - intel_ddi_init(i915, port_info->port); > + intel_ddi_init(i915, port_info); > } > } > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index df587219c744..7f2156e6966f 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1402,6 +1402,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];
Hi Lucas,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[cannot apply to drm-tip/drm-tip v5.8-rc3 next-20200703]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Lucas-De-Marchi/display-ddi-keep-register-indexes-in-a-table/20200625-081557
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-a002-20200705 (attached as .config)
compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project f804bd586ee58199db4cfb2da8e9ef067425900b)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_ddi.c:4900:28: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]
DRM_MODE_ENCODER_TMDS, port_info->name);
^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_ddi.c:4900:28: note: treat the string as an argument to avoid this
DRM_MODE_ENCODER_TMDS, port_info->name);
^
"%s",
1 error generated.
vim +4900 drivers/gpu/drm/i915/display/intel_ddi.c
4860
4861 void intel_ddi_init(struct drm_i915_private *dev_priv,
4862 const struct intel_ddi_port_info *port_info)
4863 {
4864 enum port port = port_info->port;
4865 struct intel_digital_port *intel_dig_port;
4866 struct intel_encoder *encoder;
4867 bool init_hdmi, init_dp, init_lspcon = false;
4868
4869 init_hdmi = intel_bios_port_supports_dvi(dev_priv, port) ||
4870 intel_bios_port_supports_hdmi(dev_priv, port);
4871 init_dp = intel_bios_port_supports_dp(dev_priv, port);
4872
4873 if (intel_bios_is_lspcon_present(dev_priv, port)) {
4874 /*
4875 * Lspcon device needs to be driven with DP connector
4876 * with special detection sequence. So make sure DP
4877 * is initialized before lspcon.
4878 */
4879 init_dp = true;
4880 init_lspcon = true;
4881 init_hdmi = false;
4882 drm_dbg_kms(&dev_priv->drm, "VBT says port %s has lspcon\n",
4883 port_info->name);
4884 }
4885
4886 if (!init_dp && !init_hdmi) {
4887 drm_dbg_kms(&dev_priv->drm,
4888 "VBT says port %s is not DVI/HDMI/DP compatible, respect it\n",
4889 port_info->name);
4890 return;
4891 }
4892
4893 intel_dig_port = kzalloc(sizeof(*intel_dig_port), GFP_KERNEL);
4894 if (!intel_dig_port)
4895 return;
4896
4897 encoder = &intel_dig_port->base;
4898
4899 drm_encoder_init(&dev_priv->drm, &encoder->base, &intel_ddi_funcs,
> 4900 DRM_MODE_ENCODER_TMDS, port_info->name);
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index ca7bb2294d2b..27e2f29f47a2 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4844,12 +4844,24 @@ intel_ddi_max_lanes(struct intel_digital_port *intel_dport) return max_lanes; } -void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) +bool intel_ddi_has_tc_phy(const struct intel_digital_port *dig_port) { + return dig_port->port_info->phy_type == PHY_TYPE_MG || + dig_port->port_info->phy_type == PHY_TYPE_DKL; +} + +bool 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 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 = intel_bios_port_supports_dvi(dev_priv, port) || intel_bios_port_supports_hdmi(dev_priv, port); @@ -4864,14 +4876,14 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) init_dp = true; init_lspcon = true; init_hdmi = false; - drm_dbg_kms(&dev_priv->drm, "VBT says port %c has lspcon\n", - port_name(port)); + drm_dbg_kms(&dev_priv->drm, "VBT says port %s has lspcon\n", + port_info->name); } if (!init_dp && !init_hdmi) { drm_dbg_kms(&dev_priv->drm, - "VBT says port %c is not DVI/HDMI/DP compatible, respect it\n", - port_name(port)); + "VBT says port %s is not DVI/HDMI/DP compatible, respect it\n", + port_info->name); return; } @@ -4882,7 +4894,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; @@ -4917,8 +4929,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 = !intel_bios_port_supports_typec_usb(dev_priv, port) && !intel_bios_port_supports_tbt(dev_priv, port); @@ -4951,20 +4964,20 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) if (lspcon_init(intel_dig_port)) /* TODO: handle hdmi info frame part */ drm_dbg_kms(&dev_priv->drm, - "LSPCON init success on port %c\n", - port_name(port)); + "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_err(&dev_priv->drm, - "LSPCON init failed on port %c\n", - port_name(port)); + "LSPCON init failed on port %s\n", + port_info->name); } if (INTEL_GEN(dev_priv) >= 11) { - if (intel_phy_is_tc(dev_priv, phy)) + if (intel_ddi_has_tc_phy(intel_dig_port)) intel_dig_port->connected = intel_tc_port_connected; else intel_dig_port->connected = lpt_digital_port_connected; diff --git a/drivers/gpu/drm/i915/display/intel_ddi.h b/drivers/gpu/drm/i915/display/intel_ddi.h index 077e9dbbe367..059d87171c81 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.h +++ b/drivers/gpu/drm/i915/display/intel_ddi.h @@ -13,6 +13,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; @@ -23,7 +24,8 @@ void intel_ddi_fdi_post_disable(struct intel_atomic_state *state, 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(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state); @@ -46,4 +48,8 @@ int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder, bool enable); void icl_sanitize_encoder_pll_mapping(struct intel_encoder *encoder); + +bool intel_ddi_has_tc_phy(const struct intel_digital_port *dig_port); +bool 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 d591063502c5..001b44c004ab 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -16880,7 +16880,7 @@ static void setup_ddi_outputs_desc(struct drm_i915_private *i915, if (test_bit(port_info->port, &disable_mask)) continue; - intel_ddi_init(i915, port_info->port); + intel_ddi_init(i915, port_info); } } diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index df587219c744..7f2156e6966f 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1402,6 +1402,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];
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 <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/display/intel_ddi.c | 39 ++++++++++++------- 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, 37 insertions(+), 15 deletions(-)