Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: Return correct EDP voltage swing table for 0.85V

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[] = {

Fixes: cf54ca8bc567 ("drm/i915/cnl: Implement voltage swing sequence.")
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170717195854.192139-1-mka@chromium.org
(cherry picked from commit 50946c89850db13bd672c664aec6cf4551f71fe9)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

authored by

Matthias Kaehlcke and committed by
Jani Nikula
7eceb9d0 1dd7a3e7

+1 -1
+1 -1
drivers/gpu/drm/i915/intel_ddi.c
··· 1762 1762 if (dev_priv->vbt.edp.low_vswing) { 1763 1763 if (voltage == VOLTAGE_INFO_0_85V) { 1764 1764 *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_85V); 1765 - return cnl_ddi_translations_dp_0_85V; 1765 + return cnl_ddi_translations_edp_0_85V; 1766 1766 } else if (voltage == VOLTAGE_INFO_0_95V) { 1767 1767 *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_95V); 1768 1768 return cnl_ddi_translations_edp_0_95V;