Commit d3467277 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev 

Pull fbdev updates from Helge Deller:
 "Code cleanups for offb, shmobile, sisfb, savage, au1200fb, uvesafb,
  omap2 and sh7760fb, as well as the addition of some HAS_IOPORT
  dependencies and adjustment of generated logo file to make build
  reproducible"

* tag 'fbdev-for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbdev: offb: replace of_node_put with __free(device_node)
  fbdev: savage: Handle err return when savagefb_check_var failed
  video: hdmi: prefer length specifier in format over string copying
  fbdev: uvesafb: replace deprecated strncpy with strscpy_pad
  fbdev: au1200fb: replace deprecated strncpy with strscpy
  fbdev: fsl-diu-fb: replace deprecated strncpy with strscpy_pad
  video: logo: Drop full path of the input filename in generated file
  fbdev: add HAS_IOPORT dependencies
  fbdev: sh7760fb: allow modular build
  fbdev: sisfb: hide unused variables
  fbdev: shmobile: fix snprintf truncation
  fbdev: omap2: replace of_graph_get_next_endpoint()
parents db5d28c0 ce4a7ae8

drivers/video/fbdev/Kconfig

+13 −13
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ config FB_IMX 


config FB_CYBER2000

	tristate "CyberPro 2000/2010/5000 support"

	depends on FB && PCI && (BROKEN || !SPARC64)

	depends on FB && PCI && HAS_IOPORT && (BROKEN || !SPARC64)

	select FB_IOMEM_HELPERS

	help

	  This enables support for the Integraphics CyberPro 20x0 and 5000
@@ -245,7 +245,7 @@ config FB_FM2 


config FB_ARC

	tristate "Arc Monochrome LCD board support"

	depends on FB && (X86 || COMPILE_TEST)

	depends on FB && HAS_IOPORT && (X86 || COMPILE_TEST)

	select FB_SYSMEM_HELPERS_DEFERRED

	help

	  This enables support for the Arc Monochrome LCD board. The board
@@ -1046,7 +1046,7 @@ config FB_ATY_BACKLIGHT 


config FB_S3

	tristate "S3 Trio/Virge support"

	depends on FB && PCI

	depends on FB && PCI && HAS_IOPORT

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT
@@ -1107,7 +1107,7 @@ config FB_SAVAGE_ACCEL 


config FB_SIS

	tristate "SiS/XGI display support"

	depends on FB && PCI

	depends on FB && PCI && HAS_IOPORT

	select BOOT_VESA_SUPPORT if FB_SIS = y

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA
@@ -1138,7 +1138,7 @@ config FB_SIS_315 


config FB_VIA

	tristate "VIA UniChrome (Pro) and Chrome9 display support"

	depends on FB && PCI && GPIOLIB && I2C && (X86 || COMPILE_TEST)

	depends on FB && PCI && GPIOLIB && I2C && HAS_IOPORT && (X86 || COMPILE_TEST)

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT
@@ -1177,7 +1177,7 @@ endif 


config FB_NEOMAGIC

	tristate "NeoMagic display support"

	depends on FB && PCI

	depends on FB && PCI && HAS_IOPORT

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT
@@ -1204,7 +1204,7 @@ config FB_KYRO 


config FB_3DFX

	tristate "3Dfx Banshee/Voodoo3/Voodoo5 display support"

	depends on FB && PCI

	depends on FB && PCI && HAS_IOPORT

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT
@@ -1252,7 +1252,7 @@ config FB_VOODOO1 


config FB_VT8623

	tristate "VIA VT8623 support"

	depends on FB && PCI

	depends on FB && PCI && HAS_IOPORT

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT
@@ -1267,7 +1267,7 @@ config FB_VT8623 


config FB_TRIDENT

	tristate "Trident/CyberXXX/CyberBlade support"

	depends on FB && PCI

	depends on FB && PCI && HAS_IOPORT

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT
@@ -1290,7 +1290,7 @@ config FB_TRIDENT 


config FB_ARK

	tristate "ARK 2000PV support"

	depends on FB && PCI

	depends on FB && PCI && HAS_IOPORT

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT
@@ -1648,8 +1648,8 @@ config FB_COBALT 
	select FB_IOMEM_HELPERS



config FB_SH7760

	bool "SH7760/SH7763/SH7720/SH7721 LCDC support"

	depends on FB=y && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \

	tristate "SH7760/SH7763/SH7720/SH7721 LCDC support"

	depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \

		|| CPU_SUBTYPE_SH7720 || CPU_SUBTYPE_SH7721)

	select FB_IOMEM_HELPERS

	help
@@ -1814,7 +1814,7 @@ config FB_SSD1307 


config FB_SM712

	tristate "Silicon Motion SM712 framebuffer support"

	depends on FB && PCI

	depends on FB && PCI && HAS_IOPORT

	select FB_IOMEM_HELPERS

	help

	  Frame buffer driver for the Silicon Motion SM710, SM712, SM721

drivers/video/fbdev/au1200fb.c

+1 −1
Original line number Diff line number Diff line
@@ -1557,7 +1557,7 @@ static int au1200fb_init_fbinfo(struct au1200fb_device *fbdev) 
		return ret;

	}



	strncpy(fbi->fix.id, "AU1200", sizeof(fbi->fix.id));

	strscpy(fbi->fix.id, "AU1200");

	fbi->fix.smem_start = fbdev->fb_phys;

	fbi->fix.smem_len = fbdev->fb_len;

	fbi->fix.type = FB_TYPE_PACKED_PIXELS;

drivers/video/fbdev/fsl-diu-fb.c

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ static void set_fix(struct fb_info *info) 
	struct fb_var_screeninfo *var = &info->var;

	struct mfb_info *mfbi = info->par;



	strncpy(fix->id, mfbi->id, sizeof(fix->id));

	strscpy_pad(fix->id, mfbi->id);

	fix->line_length = var->xres_virtual * var->bits_per_pixel / 8;

	fix->type = FB_TYPE_PACKED_PIXELS;

	fix->accel = FB_ACCEL_NONE;

drivers/video/fbdev/offb.c

+1 −2
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp 
			par->cmap_type = cmap_gxt2000;

	} else if (of_node_name_prefix(dp, "vga,Display-")) {

		/* Look for AVIVO initialized by SLOF */

		struct device_node *pciparent = of_get_parent(dp);

		struct device_node *pciparent __free(device_node) = of_get_parent(dp);

		const u32 *vid, *did;

		vid = of_get_property(pciparent, "vendor-id", NULL);

		did = of_get_property(pciparent, "device-id", NULL);
@@ -369,7 +369,6 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp 
			if (par->cmap_adr)

				par->cmap_type = cmap_avivo;

		}

		of_node_put(pciparent);

	} else if (dp && of_device_is_compatible(dp, "qemu,std-vga")) {

#ifdef __BIG_ENDIAN

		const __be32 io_of_addr[3] = { 0x01000000, 0x0, 0x0 };

drivers/video/fbdev/omap2/omapfb/dss/dsi.c

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/debugfs.h>

#include <linux/pm_runtime.h>

#include <linux/of.h>

#include <linux/of_graph.h>

#include <linux/of_platform.h>

#include <linux/component.h>
@@ -5079,7 +5080,7 @@ static int dsi_probe_of(struct platform_device *pdev) 
	struct device_node *ep;

	struct omap_dsi_pin_config pin_cfg;



	ep = omapdss_of_get_first_endpoint(node);

	ep = of_graph_get_endpoint_by_regs(node, 0, -1);

	if (!ep)

		return 0;