From: Ville Syrjälä Date: Wed, 28 Sep 2016 13:51:34 +0000 (+0300) Subject: UPSTREAM: drm/edid: Clear old audio latency values before parsing the new EDID X-Git-Tag: release-20171130_firefly~4^2~360 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7dc29946bd9445a6a43d134068d71b38ea87f6b4;p=firefly-linux-kernel-4.4.55.git UPSTREAM: drm/edid: Clear old audio latency values before parsing the new EDID Clear out stale audio latency information (potentially from a previous EDID) before constructing the ELD from the EDID. Change-Id: I1e770776f031864f597c5cd143c5fc120b313b7d Signed-off-by: Ville Syrjälä Acked-by: Christian König Reviewed-by: Alex Deucher Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/1475070703-6435-2-git-send-email-ville.syrjala@linux.intel.com Signed-off-by: Zheng Yang (cherry picked from commit 85c91580555ac610b266260bc7866c51bdc4d205) --- diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index cb2a0ef5f2b3..06089fc57ef8 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3698,6 +3698,13 @@ void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid) memset(eld, 0, sizeof(connector->eld)); + connector->latency_present[0] = false; + connector->latency_present[1] = false; + connector->video_latency[0] = 0; + connector->audio_latency[0] = 0; + connector->video_latency[1] = 0; + connector->audio_latency[1] = 0; + cea = drm_find_cea_extension(edid); if (!cea) { DRM_DEBUG_KMS("ELD: no CEA Extension found\n");