From: Thomas Zimmermann <tzimmermann@suse.de>
Date: Mon, 30 Sep 2024 08:50:54 +0000 (+0200)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2dd0ef5d951e9b565ddb324fe26c531b6a40bf82;p=linux.git

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

Get drm-misc-next to up v6.12-rc1.

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

2dd0ef5d951e9b565ddb324fe26c531b6a40bf82
diff --cc drivers/gpu/drm/msm/msm_drv.h
index 15de89b3cd3e,2e28a1344636..133e47bea7d5
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@@ -33,16 -33,9 +33,12 @@@
  #include <drm/msm_drm.h>
  #include <drm/drm_gem.h>
  
- #ifdef CONFIG_FAULT_INJECTION
  extern struct fault_attr fail_gem_alloc;
  extern struct fault_attr fail_gem_iova;
- #else
- #  define should_fail(attr, size) 0
- #endif
  
 +struct drm_fb_helper;
 +struct drm_fb_helper_surface_size;
 +
  struct msm_kms;
  struct msm_gpu;
  struct msm_mmu;