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

Updating drm-misc-next to the state of v6.18-rc1.

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

diff --cc .clang-format
Simple merge

diff --cc Documentation/devicetree/bindings/display/panel/panel-simple.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge

diff --cc Documentation/gpu/todo.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/Makefile
Simple merge

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

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

diff --cc drivers/gpu/drm/msm/msm_gem.c
Simple merge

diff --cc drivers/gpu/drm/panthor/panthor_sched.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_bo.c
index 81bae7a5903861165daa206e64d4aaca9bcb8d37,4410e28dee54bec46da90b4ff4b89d826133860b..fbe81cda15c2e16b09beb4f6e327152e47f4c099
--- 1/drivers/gpu/drm/xe/xe_bo.c
--- 2/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@@ -3165,11 -3582,11 +3582,11 @@@ int xe_bo_dumb_create(struct drm_file *
        u32 page_size = max_t(u32, PAGE_SIZE,
                xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K ? SZ_64K : SZ_4K);
  
 -      args->pitch = ALIGN(args->width * cpp, 64);
 -      args->size = ALIGN(mul_u32_u32(args->pitch, args->height),
 -                         page_size);
 +      err = drm_mode_size_dumb(dev, args, SZ_64, page_size);
 +      if (err)
 +              return err;
  
-       bo = xe_bo_create_user(xe, NULL, NULL, args->size,
+       bo = xe_bo_create_user(xe, NULL, args->size,
                               DRM_XE_GEM_CPU_CACHING_WC,
                               XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(xe)) |
                               XE_BO_FLAG_SCANOUT |

diff --cc drivers/video/fbdev/Kconfig
index 6cea1449b4c5d8d0beb3f699b546816d03892525,a257b739188d64ffece99981b81819a5bb95775a..a733f90eca55fe077321a717f41c709ded8de075
--- 1/drivers/video/fbdev/Kconfig
--- 2/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@@ -1058,8 -1054,10 +1055,9 @@@ config FB_S
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        select FB_IOMEM_FOPS
 -      select FB_TILEBLITTING
        select FB_SVGALIB
        select VGASTATE
+       select FB_CFB_REV_PIXELS_IN_BYTE
        select FONT_8x16 if FRAMEBUFFER_CONSOLE
        help
          Driver for graphics boards with S3 Trio / S3 Virge chip.

diff --cc drivers/video/fbdev/core/bitblit.c
Simple merge

diff --cc drivers/video/fbdev/core/fbcon.c
Simple merge

diff --cc drivers/video/fbdev/simplefb.c
Simple merge

diff --cc include/drm/drm_buddy.h
Simple merge