aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_sdvo.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2019-04-10 20:08:35 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2019-06-07 20:40:14 +0300
commitb5716a4efe5cbaabcea2027656367ac5ba5addf9 (patch)
tree3fe8a881d1390c00664a4a7b2c290b3e4e5dd3e4 /drivers/gpu/drm/i915/intel_sdvo.c
parentdrm/i915: Rename SDVO_AUDIO_ENABLE to HDMI_AUDIO_ENABLE (diff)
downloadlinux-dev-b5716a4efe5cbaabcea2027656367ac5ba5addf9.tar.xz
linux-dev-b5716a4efe5cbaabcea2027656367ac5ba5addf9.zip
drm/i915/sdvo: Check that we have space for the infoframe
Before we go writing the infoframe let's make sure we have the space for it. Not that it really matters since the write loop would just terminate early in that case. v2: Check after the debug print and ++ (Chris) Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20190410170835.18867-1-ville.syrjala@linux.intel.com Reviewed-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
-rw-r--r--drivers/gpu/drm/i915/intel_sdvo.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 899f8278d29c..bc1ef161df32 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -980,6 +980,9 @@ static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo,
DRM_DEBUG_KMS("writing sdvo hbuf: %i, hbuf_size %i, hbuf_size: %i\n",
if_index, length, hbuf_size);
+ if (hbuf_size < length)
+ return false;
+
for (i = 0; i < hbuf_size; i += 8) {
memset(tmp, 0, 8);
if (i < length)