Merge "drm/msm/dp: clean up EDID and audio functionality"