[pull] drm/msm: fixes for 3.12-rc2