Merge remote-tracking branch 'drm-msm/msm-next'

diff --cc drivers/gpu/drm/msm/adreno/a6xx_gmu.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
Simple merge

diff --cc drivers/gpu/drm/msm/hdmi/hdmi.c
index d06274633d9d7815b33cc82867a86fbef35f0fcd,ace8aab07276155ef9f2887ada59e500de318366..e247d6942a49e12ff66789887fa3a49017079ac6
--- 1/drivers/gpu/drm/msm/hdmi/hdmi.c
--- 2/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@@ -585,7 -585,7 +585,7 @@@ static int msm_hdmi_bind(struct device 
        hdmi_cfg = (struct hdmi_platform_config *)
                        of_device_get_match_data(dev);
        if (!hdmi_cfg) {
-               dev_err(dev, "unknown hdmi_cfg: %pOFn\n", of_node);
 -              DRM_DEV_ERROR(dev, "unknown hdmi_cfg: %s\n", of_node->name);
++              DRM_DEV_ERROR(dev, "unknown hdmi_cfg: %pOFn\n", of_node);
                return -ENXIO;
        }
  

diff --cc drivers/gpu/drm/msm/msm_drv.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_gem_submit.c
Simple merge