Commit 52920704 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-next-2023-07-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v6.6:

UAPI Changes:

Cross-subsystem Changes:

 * dma-buf:
   * Documentation fixes

 * fbdev:
   * Make FB core selectable without drivers
   * Remove obsolete flags FBINFO_DEFAULT and FBINFO_FLAG_DEFAULT
     from all drivers and <linux/fb.h>
   * Add helper macros and Kconfig tokens for DMA-allocated framebuffers
   * Cleanups

Core Changes:

 * Respect given gfp flags in drmm_kmalloc()

Driver Changes:

 * ast:
   * Cleanups

 * bridge:
   * anx7625: Locking fixes
 * tc358767: Fix hardware delays
   * Minor fixes and cleanups

 * exynos:
   * Use fbdev DMA helpers

 * komeda:
   * Always attach encoder

 * omapdrm:
   * Use fbdev DMA helpers

 * panel:
   * ld9040: Fix Kconfig dependency
   * Minor cleanups

 * ssd130x:
   * Fix allocation of temporary buffers
   * Fix pitch computation

 * tegra:
   * Use fbdev DMA helpers

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230727124444.GA5547@linux-uq9g
parents 5c1b19b4 7c5aa948

arch/sh/boards/mach-sh7763rdp/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static struct fb_videomode sh7763fb_videomode = { 
	.vsync_len = 1,

	.sync = 0,

	.vmode = FB_VMODE_NONINTERLACED,

	.flag = FBINFO_FLAG_DEFAULT,

	.flag = FB_MODE_IS_UNKNOWN,

};



static struct sh7760fb_platdata sh7763fb_def_pdata = {

arch/x86/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ drivers-$(CONFIG_PCI) += arch/x86/pci/ 
# suspend and hibernation support

drivers-$(CONFIG_PM) += arch/x86/power/



drivers-$(CONFIG_FB) += arch/x86/video/

drivers-$(CONFIG_FB_CORE) += arch/x86/video/



####

# boot loader support. Several targets are kept for legacy purposes

arch/x86/video/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_FB)               += fbdev.o
 
obj-$(CONFIG_FB_CORE)		+= fbdev.o

drivers/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -129,8 +129,6 @@ source "drivers/dma-buf/Kconfig" 


source "drivers/dca/Kconfig"



source "drivers/auxdisplay/Kconfig"



source "drivers/uio/Kconfig"



source "drivers/vfio/Kconfig"

drivers/auxdisplay/cfag12864bfb.c

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ static int cfag12864bfb_probe(struct platform_device *device) 
	info->var = cfag12864bfb_var;

	info->pseudo_palette = NULL;

	info->par = NULL;

	info->flags = FBINFO_FLAG_DEFAULT;



	if (register_framebuffer(info) < 0)

		goto fballoced;