Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6699dd3 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Fix wrong number of HDMI translation entries 



I keep telling myself that those tables aren't great because their size
is the number of dwords we need to program and not the number of entries
(number of dwords = number of entries * 2).

And... I got it wrong when I refactored the code. Fortunately, it was
only wrong when the VBT table (or the code parsing it) is itself
erroneous. Long story short, it shouldn't matter, but still, there's a
potential array overflow and random programming of the DDI translation
tables.

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3bb11b53

drivers/gpu/drm/i915/intel_ddi.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -169,14 +169,14 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port) 
		ddi_translations_dp = bdw_ddi_translations_dp;

		ddi_translations_dp = bdw_ddi_translations_dp;

		ddi_translations_edp = bdw_ddi_translations_edp;

		ddi_translations_edp = bdw_ddi_translations_edp;

		ddi_translations_hdmi = bdw_ddi_translations_hdmi;

		ddi_translations_hdmi = bdw_ddi_translations_hdmi;

		n_hdmi_entries = ARRAY_SIZE(bdw_ddi_translations_hdmi);

		n_hdmi_entries = ARRAY_SIZE(bdw_ddi_translations_hdmi) / 2;

		hdmi_800mV_0dB = 7;

		hdmi_800mV_0dB = 7;

	} else if (IS_HASWELL(dev)) {

	} else if (IS_HASWELL(dev)) {

		ddi_translations_fdi = hsw_ddi_translations_fdi;

		ddi_translations_fdi = hsw_ddi_translations_fdi;

		ddi_translations_dp = hsw_ddi_translations_dp;

		ddi_translations_dp = hsw_ddi_translations_dp;

		ddi_translations_edp = hsw_ddi_translations_dp;

		ddi_translations_edp = hsw_ddi_translations_dp;

		ddi_translations_hdmi = hsw_ddi_translations_hdmi;

		ddi_translations_hdmi = hsw_ddi_translations_hdmi;

		n_hdmi_entries = ARRAY_SIZE(hsw_ddi_translations_hdmi);

		n_hdmi_entries = ARRAY_SIZE(hsw_ddi_translations_hdmi) / 2;

		hdmi_800mV_0dB = 6;

		hdmi_800mV_0dB = 6;

	} else {

	} else {

		WARN(1, "ddi translation table missing\n");

		WARN(1, "ddi translation table missing\n");
@@ -184,7 +184,7 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port) 
		ddi_translations_fdi = bdw_ddi_translations_fdi;

		ddi_translations_fdi = bdw_ddi_translations_fdi;

		ddi_translations_dp = bdw_ddi_translations_dp;

		ddi_translations_dp = bdw_ddi_translations_dp;

		ddi_translations_hdmi = bdw_ddi_translations_hdmi;

		ddi_translations_hdmi = bdw_ddi_translations_hdmi;

		n_hdmi_entries = ARRAY_SIZE(bdw_ddi_translations_hdmi);

		n_hdmi_entries = ARRAY_SIZE(bdw_ddi_translations_hdmi) / 2;

		hdmi_800mV_0dB = 7;

		hdmi_800mV_0dB = 7;

	}

	}