msm_mdp: updated from jb_mr1_chocolate