Merge tag 'drm-msm-fixes-2022-10-24' of https://gitlab.freedesktop.org/drm/msm into...

msm-fixes for v6.1

- Fix shrinker deadlock
- Fix crash during suspend after unbind
- Fix IRQ lifetime issues
- Fix potential memory corruption with too many bridges
- Fix memory corruption on GPU state capture

Signed-off-by: Dave Airlie <[email protected]>
From: Rob Clark <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGveadezhqm=Sra7Jq4A3tFAp_eBmKKOoHLnapN03pVoLw@mail.gmail.com

diff --combined drivers/gpu/drm/msm/msm_drv.c
index 28034c21f6bcd6bb229342e88ab477807b821d27,fec6d449eded594b927fd54a0a9b58d6f050f66b..105b5b48e828c0d90f730f95b13c1baac62ffe9d
--- 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)) {