msm_fb: hdmi: code merge fix