Message ID | 20170717182127.59072-1-mka@chromium.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, 2017-07-17 at 18:55 +0000, Pandiyan, Dhinakaran wrote: > Looks like a typo in > > cf54ca8 ("drm/i915/cnl: Implement voltage swing sequence.") > > but Cc'ing Rodrigo, Clint to make sure this wasn't a workaround. > > -DK Checked with Clint, this wasn't a workaround, a typo indeed. > On Mon, 2017-07-17 at 11:21 -0700, Matthias Kaehlcke wrote: > > For 0.85V cnl_get_buf_trans_edp() returns the DP table, instead of EDP. > > Use the correct table. > > > > The error was pointed out by this clang warning: > > > > drivers/gpu/drm/i915/intel_ddi.c:392:39: warning: variable > > 'cnl_ddi_translations_edp_0_85V' is not needed and will not be emitted > > [-Wunneeded-internal-declaration] > > static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_0_85V[] = { > > > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > > --- > > drivers/gpu/drm/i915/intel_ddi.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c > > index efb13582dc73..6fa02e6a7a9b 100644 > > --- a/drivers/gpu/drm/i915/intel_ddi.c > > +++ b/drivers/gpu/drm/i915/intel_ddi.c > > @@ -1873,7 +1873,7 @@ cnl_get_buf_trans_edp(struct drm_i915_private *dev_priv, > > if (dev_priv->vbt.edp.low_vswing) { > > if (voltage == VOLTAGE_INFO_0_85V) { > > *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_85V); > > - return cnl_ddi_translations_dp_0_85V; > > + return cnl_ddi_translations_edp_0_85V; > > } else if (voltage == VOLTAGE_INFO_0_95V) { > > *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_95V); > > return cnl_ddi_translations_edp_0_95V; > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Mon, Jul 17, 2017 at 08:59:18PM +0000, Pandiyan, Dhinakaran wrote: > > > > On Mon, 2017-07-17 at 18:55 +0000, Pandiyan, Dhinakaran wrote: > > Looks like a typo in > > > > cf54ca8 ("drm/i915/cnl: Implement voltage swing sequence.") > > > > but Cc'ing Rodrigo, Clint to make sure this wasn't a workaround. > > > > -DK > > Checked with Clint, this wasn't a workaround, a typo indeed. > > Yup, Like I mentioned in the previous reply, I am positive that this should return cnl_ddi_translations_edp_0_85 since I had discussed this with Rodrigo while working on ddi buffer initialization. Matthias, please go ahead and add the Fixes Tag like I mentioned in my previous message. Thanks for catching this. Manasi > > > On Mon, 2017-07-17 at 11:21 -0700, Matthias Kaehlcke wrote: > > > For 0.85V cnl_get_buf_trans_edp() returns the DP table, instead of EDP. > > > Use the correct table. > > > > > > The error was pointed out by this clang warning: > > > > > > drivers/gpu/drm/i915/intel_ddi.c:392:39: warning: variable > > > 'cnl_ddi_translations_edp_0_85V' is not needed and will not be emitted > > > [-Wunneeded-internal-declaration] > > > static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_0_85V[] = { > > > > > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > > > --- > > > drivers/gpu/drm/i915/intel_ddi.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c > > > index efb13582dc73..6fa02e6a7a9b 100644 > > > --- a/drivers/gpu/drm/i915/intel_ddi.c > > > +++ b/drivers/gpu/drm/i915/intel_ddi.c > > > @@ -1873,7 +1873,7 @@ cnl_get_buf_trans_edp(struct drm_i915_private *dev_priv, > > > if (dev_priv->vbt.edp.low_vswing) { > > > if (voltage == VOLTAGE_INFO_0_85V) { > > > *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_85V); > > > - return cnl_ddi_translations_dp_0_85V; > > > + return cnl_ddi_translations_edp_0_85V; > > > } else if (voltage == VOLTAGE_INFO_0_95V) { > > > *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_95V); > > > return cnl_ddi_translations_edp_0_95V; > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index efb13582dc73..6fa02e6a7a9b 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1873,7 +1873,7 @@ cnl_get_buf_trans_edp(struct drm_i915_private *dev_priv, if (dev_priv->vbt.edp.low_vswing) { if (voltage == VOLTAGE_INFO_0_85V) { *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_85V); - return cnl_ddi_translations_dp_0_85V; + return cnl_ddi_translations_edp_0_85V; } else if (voltage == VOLTAGE_INFO_0_95V) { *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_95V); return cnl_ddi_translations_edp_0_95V;
For 0.85V cnl_get_buf_trans_edp() returns the DP table, instead of EDP. Use the correct table. The error was pointed out by this clang warning: drivers/gpu/drm/i915/intel_ddi.c:392:39: warning: variable 'cnl_ddi_translations_edp_0_85V' is not needed and will not be emitted [-Wunneeded-internal-declaration] static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_0_85V[] = { Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- drivers/gpu/drm/i915/intel_ddi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)