Merge tag 'amd-drm-next-7.1-2026-03-12' of https://gitlab.freedesktop.org/agd5f/linux...

amd-drm-next-7.1-2026-03-12:

amdgpu:
- SMU13 fix
- SMU14 fix
- Fixes for bring up hw testing
- Kerneldoc fix
- GC12 idle power fix for compute workloads
- DCCG fixes
- UserQ fixes
- Move test for fbdev object to a generic helper
- GC 12.1 updates
- Use struct drm_edid in non-DC code
- Include IP discovery data in devcoredump
- SMU 13.x updates
- Misc cleanups
- DML 2.1 fixes
- Enable NV12/P010 support on primary planes
- Enable color encoding and color range on overlay planes
- DC underflow fixes
- HWSS fast path fixes
- Replay fixes
- DCN 4.2 updates
- Support newer IP discovery tables
- LSDMA 7.1 support
- IH 7.1 fixes
- SoC v1 updates
- GC12.1 updates
- PSP 15 updates
- XGMI fixes
- GPUVM locking fix

amdkfd:
- Fix missing BO unreserve in an error path

radeon:
- Move test for fbdev object to a generic helper

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20260312184425.3875669-1-alexander.deucher@amd.com
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/drm_fb_helper.c
Simple merge

diff --cc include/drm/drm_fb_helper.h
index 15274b8a1d9782fe7f71db4e7e33243817bd9d8c,ca214b5c028332290f6a5bf1393bd0fe9dbba4cc..bf391903443d5100d44ea535d0f4cf4cb728111b
--- 1/include/drm/drm_fb_helper.h
--- 2/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@@ -271,6 -271,119 +271,8 @@@ int drm_fb_helper_ioctl(struct fb_info 
  
  int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper);
  int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper);
 -#else
 -static inline bool drm_fb_helper_gem_is_fb(const struct drm_fb_helper *fb_helper,
 -                                         const struct drm_gem_object *obj)
 -{
 -      return false;
 -}
 -
 -static inline void drm_fb_helper_prepare(struct drm_device *dev,
 -                                       struct drm_fb_helper *helper,
 -                                       unsigned int preferred_bpp,
 -                                       const struct drm_fb_helper_funcs *funcs)
 -{
 -}
 -
 -static inline void drm_fb_helper_unprepare(struct drm_fb_helper *fb_helper)
 -{
 -}
 -
 -static inline int drm_fb_helper_init(struct drm_device *dev,
 -                     struct drm_fb_helper *helper)
 -{
 -      /* So drivers can use it to free the struct */
 -      helper->dev = dev;
 -      dev->fb_helper = helper;
 -
 -      return 0;
 -}
 -
 -static inline void drm_fb_helper_fini(struct drm_fb_helper *helper)
 -{
 -      if (helper && helper->dev)
 -              helper->dev->fb_helper = NULL;
 -}
 -
 -static inline int drm_fb_helper_blank(int blank, struct fb_info *info)
 -{
 -      return 0;
 -}
 -
 -static inline int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
 -                                          struct fb_info *info)
 -{
 -      return 0;
 -}
 -
 -static inline int drm_fb_helper_set_par(struct fb_info *info)
 -{
 -      return 0;
 -}
 -
 -static inline int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
 -                                        struct fb_info *info)
 -{
 -      return 0;
 -}
 -
 -static inline int
 -drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)
 -{
 -      return 0;
 -}
 -
 -static inline void drm_fb_helper_unregister_info(struct drm_fb_helper *fb_helper)
 -{
 -}
 -
 -static inline void
 -drm_fb_helper_fill_info(struct fb_info *info,
 -                      struct drm_fb_helper *fb_helper,
 -                      struct drm_fb_helper_surface_size *sizes)
 -{
 -}
 -
 -static inline int drm_fb_helper_setcmap(struct fb_cmap *cmap,
 -                                      struct fb_info *info)
 -{
 -      return 0;
 -}
 -
 -static inline int drm_fb_helper_ioctl(struct fb_info *info, unsigned int cmd,
 -                                    unsigned long arg)
 -{
 -      return 0;
 -}
 -
 -#ifdef CONFIG_FB_DEFERRED_IO
 -static inline void drm_fb_helper_deferred_io(struct fb_info *info,
 -                                           struct list_head *pagelist)
 -{
 -}
 -#endif
 -
 -static inline void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper,
 -                                           bool suspend)
 -{
 -}
 -
 -static inline void
 -drm_fb_helper_set_suspend_unlocked(struct drm_fb_helper *fb_helper, bool suspend)
 -{
 -}
 -
 -static inline int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper)
 -{
 -      return 0;
 -}
 -
 -static inline int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper)
 -{
 -      return 0;
 -}
+ bool drm_fb_helper_gem_is_fb(const struct drm_fb_helper *fb_helper,
+                            const struct drm_gem_object *obj);
  #endif
  
  #endif