Merge remote-tracking branch 'msm/msm-fixes' into HEAD

diff --combined drivers/gpu/drm/msm/msm_drv.c
index 28034c2,fec6d44..105b5b4
--- 1/drivers/gpu/drm/msm/msm_drv.c
--- 2/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@@ -247,6 -247,7 +247,7 @@@ static int msm_drm_uninit(struct devic
  
        for (i = 0; i < priv->num_bridges; i++)
                drm_bridge_remove(priv->bridges[i]);
+       priv->num_bridges = 0;
  
        pm_runtime_get_sync(dev);
        msm_irq_uninstall(ddev);
@@@ -361,7 -362,7 +362,7 @@@ static int msm_init_vram(struct drm_dev
                DRM_INFO("using VRAM carveout: %lx@%pa\n", size, &r.start);
  
                /* if we have no IOMMU, then we need to use carveout allocator.
 -               * Grab the entire CMA chunk carved out in early startup in
 +               * Grab the entire DMA chunk carved out in early startup in
                 * mach-msm:
                 */
        } else if (!msm_use_mmu(dev)) {