Merge tag 'drm-misc-next-fixes-2023-02-21' of git://anongit.freedesktop.org/drm/drm...

Short summary of fixes pull:

Fixes GEM SHMEM locking and generic fbdev hotplugging. Constifies
dma_buf kobj type.

Signed-off-by: Dave Airlie <[email protected]>
From: Thomas Zimmermann <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/Y/S6tu3gdQ0VizR+@linux-uq9g

diff --combined drivers/gpu/drm/i915/display/intel_fbdev.c
index 4d761c8d42ab7a17f1f9c41726ae70632bb21954,3a11e23c45afe1fea42ec0beed0f923d7108e8ad..9863963daecaf29d66f4d872358df085898cf3a8
--- 1/drivers/gpu/drm/i915/display/intel_fbdev.c
--- 2/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@@ -340,6 -340,7 +340,7 @@@ static void intel_fbdev_destroy(struct 
        if (ifbdev->fb)
                drm_framebuffer_remove(&ifbdev->fb->base);
  
+       drm_fb_helper_unprepare(&ifbdev->helper);
        kfree(ifbdev);
  }
  
@@@ -620,13 -621,7 +621,13 @@@ void intel_fbdev_set_suspend(struct drm
        struct intel_fbdev *ifbdev = dev_priv->display.fbdev.fbdev;
        struct fb_info *info;
  
 -      if (!ifbdev || !ifbdev->vma)
 +      if (!ifbdev)
 +              return;
 +
 +      if (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)))
 +              return;
 +
 +      if (!ifbdev->vma)
                goto set_suspend;
  
        info = ifbdev->helper.info;