From: Thomas Zimmermann <tzimmermann@suse.de>
Date: Sun, 16 Apr 2023 16:50:39 +0000 (+0200)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7f6f26d7adee150e09d7537acc6d6894c27c0b7a;p=linux.git

Merge drm/drm-next into drm-misc-next

Backmerging drm-next to sync with msm tree. Resolves a conflict
between aperture-helper changes and msm's use of those interfaces.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---

7f6f26d7adee150e09d7537acc6d6894c27c0b7a
diff --cc drivers/gpu/drm/msm/msm_drv.c
index aca48c868c14d,b4cfa44a8a5c4..060c7689a739b
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@@ -449,7 -452,12 +452,12 @@@ static int msm_drm_init(struct device *
  	/* Bind all our sub-components: */
  	ret = component_bind_all(dev, ddev);
  	if (ret)
- 		goto err_drm_dev_put;
+ 		goto err_deinit_vram;
+ 
+ 	/* the fw fb could be anywhere in memory */
 -	ret = drm_aperture_remove_framebuffers(false, drv);
++	ret = drm_aperture_remove_framebuffers(drv);
+ 	if (ret)
+ 		goto err_msm_uninit;
  
  	dma_set_max_seg_size(dev, UINT_MAX);