From: Thomas Zimmermann <tzimmermann@suse.de>
Date: Mon, 13 Oct 2025 07:19:19 +0000 (+0200)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b966ae42235a88eaea714be09ff3d698535bdfe;p=thirdparty%2Fkernel%2Flinux.git

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>
---

9b966ae42235a88eaea714be09ff3d698535bdfe
diff --cc drivers/gpu/drm/xe/xe_bo.c
index 81bae7a590386,4410e28dee54b..fbe81cda15c2e
--- a/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 6cea1449b4c5d,a257b739188d6..a733f90eca55f
--- a/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.