| Message ID | 20190621020132.1164-6-matthew.d.roper@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | EHL port programming | expand |
On Thu, 2019-06-20 at 19:01 -0700, Matt Roper wrote: > EHL has four DDI's (DDI-A and DDI-D share combo PHY A). > > Cc: José Roberto de Souza <jose.souza@intel.com> > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index e72ace42327c..74cd180360f4 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -15128,6 +15128,7 @@ static void intel_setup_outputs(struct > drm_i915_private *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); Here we should only initialize only the one that is going to be used A or D at this point we already have that information and the mux set. > icl_dsi_init(dev_priv); > } else if (INTEL_GEN(dev_priv) >= 11) { > intel_ddi_init(dev_priv, PORT_A);
On Fri, Jun 21, 2019 at 01:52:16PM -0700, Souza, Jose wrote: > On Thu, 2019-06-20 at 19:01 -0700, Matt Roper wrote: > > EHL has four DDI's (DDI-A and DDI-D share combo PHY A). > > > > Cc: José Roberto de Souza <jose.souza@intel.com> > > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_display.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > > b/drivers/gpu/drm/i915/display/intel_display.c > > index e72ace42327c..74cd180360f4 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -15128,6 +15128,7 @@ static void intel_setup_outputs(struct > > drm_i915_private *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); > > Here we should only initialize only the one that is going to be used A > or D at this point we already have that information and the mux set. Doesn't intel_ddi_init() already take care of this for us? I.e., init_hdmi and init_dp will both be false for whichever DDI isn't in use so the function should just bail out with a DRM_DEBUG_KMS() message and not really do anything if I'm understanding correctly. Matt > > > icl_dsi_init(dev_priv); > > } else if (INTEL_GEN(dev_priv) >= 11) { > > intel_ddi_init(dev_priv, PORT_A);
On Tue, 2019-06-25 at 15:19 -0700, Matt Roper wrote: > On Fri, Jun 21, 2019 at 01:52:16PM -0700, Souza, Jose wrote: > > On Thu, 2019-06-20 at 19:01 -0700, Matt Roper wrote: > > > EHL has four DDI's (DDI-A and DDI-D share combo PHY A). > > > > > > Cc: José Roberto de Souza <jose.souza@intel.com> > > > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > > > --- > > > drivers/gpu/drm/i915/display/intel_display.c | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > > > b/drivers/gpu/drm/i915/display/intel_display.c > > > index e72ace42327c..74cd180360f4 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > > @@ -15128,6 +15128,7 @@ static void intel_setup_outputs(struct > > > drm_i915_private *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); > > > > Here we should only initialize only the one that is going to be > > used A > > or D at this point we already have that information and the mux > > set. > > Doesn't intel_ddi_init() already take care of this for us? I.e., > init_hdmi and init_dp will both be false for whichever DDI isn't in > use > so the function should just bail out with a DRM_DEBUG_KMS() message > and > not really do anything if I'm understanding correctly. Good point, lets hope that VBT is set this clean. > > > Matt > > > > icl_dsi_init(dev_priv); > > > } else if (INTEL_GEN(dev_priv) >= 11) { > > > intel_ddi_init(dev_priv, PORT_A);
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index e72ace42327c..74cd180360f4 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -15128,6 +15128,7 @@ static void intel_setup_outputs(struct drm_i915_private *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); } else if (INTEL_GEN(dev_priv) >= 11) { intel_ddi_init(dev_priv, PORT_A);
EHL has four DDI's (DDI-A and DDI-D share combo PHY A). Cc: José Roberto de Souza <jose.souza@intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 1 + 1 file changed, 1 insertion(+)