tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds d3467277 db5d28c0

+35 -59
+13 -13
drivers/video/fbdev/Kconfig
··· 157 157 158 158 config FB_CYBER2000 159 159 tristate "CyberPro 2000/2010/5000 support" 160 - depends on FB && PCI && (BROKEN || !SPARC64) 160 + depends on FB && PCI && HAS_IOPORT && (BROKEN || !SPARC64) 161 161 select FB_IOMEM_HELPERS 162 162 help 163 163 This enables support for the Integraphics CyberPro 20x0 and 5000 ··· 245 245 246 246 config FB_ARC 247 247 tristate "Arc Monochrome LCD board support" 248 - depends on FB && (X86 || COMPILE_TEST) 248 + depends on FB && HAS_IOPORT && (X86 || COMPILE_TEST) 249 249 select FB_SYSMEM_HELPERS_DEFERRED 250 250 help 251 251 This enables support for the Arc Monochrome LCD board. The board ··· 1046 1046 1047 1047 config FB_S3 1048 1048 tristate "S3 Trio/Virge support" 1049 - depends on FB && PCI 1049 + depends on FB && PCI && HAS_IOPORT 1050 1050 select FB_CFB_FILLRECT 1051 1051 select FB_CFB_COPYAREA 1052 1052 select FB_CFB_IMAGEBLIT ··· 1107 1107 1108 1108 config FB_SIS 1109 1109 tristate "SiS/XGI display support" 1110 - depends on FB && PCI 1110 + depends on FB && PCI && HAS_IOPORT 1111 1111 select BOOT_VESA_SUPPORT if FB_SIS = y 1112 1112 select FB_CFB_FILLRECT 1113 1113 select FB_CFB_COPYAREA ··· 1138 1138 1139 1139 config FB_VIA 1140 1140 tristate "VIA UniChrome (Pro) and Chrome9 display support" 1141 - depends on FB && PCI && GPIOLIB && I2C && (X86 || COMPILE_TEST) 1141 + depends on FB && PCI && GPIOLIB && I2C && HAS_IOPORT && (X86 || COMPILE_TEST) 1142 1142 select FB_CFB_FILLRECT 1143 1143 select FB_CFB_COPYAREA 1144 1144 select FB_CFB_IMAGEBLIT ··· 1177 1177 1178 1178 config FB_NEOMAGIC 1179 1179 tristate "NeoMagic display support" 1180 - depends on FB && PCI 1180 + depends on FB && PCI && HAS_IOPORT 1181 1181 select FB_CFB_FILLRECT 1182 1182 select FB_CFB_COPYAREA 1183 1183 select FB_CFB_IMAGEBLIT ··· 1204 1204 1205 1205 config FB_3DFX 1206 1206 tristate "3Dfx Banshee/Voodoo3/Voodoo5 display support" 1207 - depends on FB && PCI 1207 + depends on FB && PCI && HAS_IOPORT 1208 1208 select FB_CFB_FILLRECT 1209 1209 select FB_CFB_COPYAREA 1210 1210 select FB_CFB_IMAGEBLIT ··· 1252 1252 1253 1253 config FB_VT8623 1254 1254 tristate "VIA VT8623 support" 1255 - depends on FB && PCI 1255 + depends on FB && PCI && HAS_IOPORT 1256 1256 select FB_CFB_FILLRECT 1257 1257 select FB_CFB_COPYAREA 1258 1258 select FB_CFB_IMAGEBLIT ··· 1267 1267 1268 1268 config FB_TRIDENT 1269 1269 tristate "Trident/CyberXXX/CyberBlade support" 1270 - depends on FB && PCI 1270 + depends on FB && PCI && HAS_IOPORT 1271 1271 select FB_CFB_FILLRECT 1272 1272 select FB_CFB_COPYAREA 1273 1273 select FB_CFB_IMAGEBLIT ··· 1290 1290 1291 1291 config FB_ARK 1292 1292 tristate "ARK 2000PV support" 1293 - depends on FB && PCI 1293 + depends on FB && PCI && HAS_IOPORT 1294 1294 select FB_CFB_FILLRECT 1295 1295 select FB_CFB_COPYAREA 1296 1296 select FB_CFB_IMAGEBLIT ··· 1648 1648 select FB_IOMEM_HELPERS 1649 1649 1650 1650 config FB_SH7760 1651 - bool "SH7760/SH7763/SH7720/SH7721 LCDC support" 1652 - depends on FB=y && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \ 1651 + tristate "SH7760/SH7763/SH7720/SH7721 LCDC support" 1652 + depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \ 1653 1653 || CPU_SUBTYPE_SH7720 || CPU_SUBTYPE_SH7721) 1654 1654 select FB_IOMEM_HELPERS 1655 1655 help ··· 1814 1814 1815 1815 config FB_SM712 1816 1816 tristate "Silicon Motion SM712 framebuffer support" 1817 - depends on FB && PCI 1817 + depends on FB && PCI && HAS_IOPORT 1818 1818 select FB_IOMEM_HELPERS 1819 1819 help 1820 1820 Frame buffer driver for the Silicon Motion SM710, SM712, SM721
+1 -1
drivers/video/fbdev/au1200fb.c
··· 1557 1557 return ret; 1558 1558 } 1559 1559 1560 - strncpy(fbi->fix.id, "AU1200", sizeof(fbi->fix.id)); 1560 + strscpy(fbi->fix.id, "AU1200"); 1561 1561 fbi->fix.smem_start = fbdev->fb_phys; 1562 1562 fbi->fix.smem_len = fbdev->fb_len; 1563 1563 fbi->fix.type = FB_TYPE_PACKED_PIXELS;
+1 -1
drivers/video/fbdev/fsl-diu-fb.c
··· 787 787 struct fb_var_screeninfo *var = &info->var; 788 788 struct mfb_info *mfbi = info->par; 789 789 790 - strncpy(fix->id, mfbi->id, sizeof(fix->id)); 790 + strscpy_pad(fix->id, mfbi->id); 791 791 fix->line_length = var->xres_virtual * var->bits_per_pixel / 8; 792 792 fix->type = FB_TYPE_PACKED_PIXELS; 793 793 fix->accel = FB_ACCEL_NONE;
+1 -2
drivers/video/fbdev/offb.c
··· 357 357 par->cmap_type = cmap_gxt2000; 358 358 } else if (of_node_name_prefix(dp, "vga,Display-")) { 359 359 /* Look for AVIVO initialized by SLOF */ 360 - struct device_node *pciparent = of_get_parent(dp); 360 + struct device_node *pciparent __free(device_node) = of_get_parent(dp); 361 361 const u32 *vid, *did; 362 362 vid = of_get_property(pciparent, "vendor-id", NULL); 363 363 did = of_get_property(pciparent, "device-id", NULL); ··· 369 369 if (par->cmap_adr) 370 370 par->cmap_type = cmap_avivo; 371 371 } 372 - of_node_put(pciparent); 373 372 } else if (dp && of_device_is_compatible(dp, "qemu,std-vga")) { 374 373 #ifdef __BIG_ENDIAN 375 374 const __be32 io_of_addr[3] = { 0x01000000, 0x0, 0x0 };
+2 -1
drivers/video/fbdev/omap2/omapfb/dss/dsi.c
··· 28 28 #include <linux/debugfs.h> 29 29 #include <linux/pm_runtime.h> 30 30 #include <linux/of.h> 31 + #include <linux/of_graph.h> 31 32 #include <linux/of_platform.h> 32 33 #include <linux/component.h> 33 34 ··· 5080 5079 struct device_node *ep; 5081 5080 struct omap_dsi_pin_config pin_cfg; 5082 5081 5083 - ep = omapdss_of_get_first_endpoint(node); 5082 + ep = of_graph_get_endpoint_by_regs(node, 0, -1); 5084 5083 if (!ep) 5085 5084 return 0; 5086 5085
+1 -19
drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
··· 130 130 return np; 131 131 } 132 132 133 - struct device_node * 134 - omapdss_of_get_first_endpoint(const struct device_node *parent) 135 - { 136 - struct device_node *port, *ep; 137 - 138 - port = omapdss_of_get_next_port(parent, NULL); 139 - 140 - if (!port) 141 - return NULL; 142 - 143 - ep = omapdss_of_get_next_endpoint(port, NULL); 144 - 145 - of_node_put(port); 146 - 147 - return ep; 148 - } 149 - EXPORT_SYMBOL_GPL(omapdss_of_get_first_endpoint); 150 - 151 133 struct omap_dss_device * 152 134 omapdss_of_find_source_for_first_ep(struct device_node *node) 153 135 { ··· 137 155 struct device_node *src_port; 138 156 struct omap_dss_device *src; 139 157 140 - ep = omapdss_of_get_first_endpoint(node); 158 + ep = of_graph_get_endpoint_by_regs(node, 0, -1); 141 159 if (!ep) 142 160 return ERR_PTR(-EINVAL); 143 161
+2 -1
drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
··· 20 20 #include <linux/pm_runtime.h> 21 21 #include <linux/clk.h> 22 22 #include <linux/of.h> 23 + #include <linux/of_graph.h> 23 24 #include <linux/regulator/consumer.h> 24 25 #include <linux/component.h> 25 26 #include <video/omapfb_dss.h> ··· 530 529 struct device_node *ep; 531 530 int r; 532 531 533 - ep = omapdss_of_get_first_endpoint(node); 532 + ep = of_graph_get_endpoint_by_regs(node, 0, -1); 534 533 if (!ep) 535 534 return 0; 536 535
+2 -1
drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
··· 25 25 #include <linux/pm_runtime.h> 26 26 #include <linux/clk.h> 27 27 #include <linux/of.h> 28 + #include <linux/of_graph.h> 28 29 #include <linux/regulator/consumer.h> 29 30 #include <linux/component.h> 30 31 #include <video/omapfb_dss.h> ··· 562 561 struct device_node *ep; 563 562 int r; 564 563 565 - ep = omapdss_of_get_first_endpoint(node); 564 + ep = of_graph_get_endpoint_by_regs(node, 0, -1); 566 565 if (!ep) 567 566 return 0; 568 567
+2 -1
drivers/video/fbdev/omap2/omapfb/dss/venc.c
··· 24 24 #include <linux/regulator/consumer.h> 25 25 #include <linux/pm_runtime.h> 26 26 #include <linux/of.h> 27 + #include <linux/of_graph.h> 27 28 #include <linux/component.h> 28 29 29 30 #include <video/omapfb_dss.h> ··· 765 764 u32 channels; 766 765 int r; 767 766 768 - ep = omapdss_of_get_first_endpoint(node); 767 + ep = of_graph_get_endpoint_by_regs(node, 0, -1); 769 768 if (!ep) 770 769 return 0; 771 770
+1 -1
drivers/video/fbdev/pxafb.c
··· 2171 2171 u32 bus_width; 2172 2172 int ret, i; 2173 2173 2174 - np = of_graph_get_next_endpoint(dev->of_node, NULL); 2174 + np = of_graph_get_endpoint_by_regs(dev->of_node, 0, -1); 2175 2175 if (!np) { 2176 2176 dev_err(dev, "could not find endpoint\n"); 2177 2177 return -EINVAL;
+4 -1
drivers/video/fbdev/savage/savagefb_driver.c
··· 2276 2276 if (info->var.xres_virtual > 0x1000) 2277 2277 info->var.xres_virtual = 0x1000; 2278 2278 #endif 2279 - savagefb_check_var(&info->var, info); 2279 + err = savagefb_check_var(&info->var, info); 2280 + if (err) 2281 + goto failed; 2282 + 2280 2283 savagefb_set_fix(info); 2281 2284 2282 2285 /*
+1 -1
drivers/video/fbdev/sh_mobile_lcdcfb.c
··· 1575 1575 */ 1576 1576 info->fix = sh_mobile_lcdc_overlay_fix; 1577 1577 snprintf(info->fix.id, sizeof(info->fix.id), 1578 - "SH Mobile LCDC Overlay %u", ovl->index); 1578 + "SHMobile ovl %u", ovl->index); 1579 1579 info->fix.smem_start = ovl->dma_handle; 1580 1580 info->fix.smem_len = ovl->fb_size; 1581 1581 info->fix.line_length = ovl->pitch;
+1 -2
drivers/video/fbdev/sis/init301.c
··· 172 172 }; 173 173 174 174 /* 301C / 302ELV extended Part2 TV registers (4 tap scaler) */ 175 - 175 + #ifdef CONFIG_FB_SIS_315 176 176 static const unsigned char SiS_Part2CLVX_1[] = { 177 177 0x00,0x00, 178 178 0x00,0x20,0x00,0x00,0x7F,0x20,0x02,0x7F,0x7D,0x20,0x04,0x7F,0x7D,0x1F,0x06,0x7E, ··· 245 245 0xFF,0xFF, 246 246 }; 247 247 248 - #ifdef CONFIG_FB_SIS_315 249 248 /* 661 et al LCD data structure (2.03.00) */ 250 249 static const unsigned char SiS_LCDStruct661[] = { 251 250 /* 1024x768 */
+1 -1
drivers/video/fbdev/uvesafb.c
··· 1867 1867 static ssize_t v86d_store(struct device_driver *dev, const char *buf, 1868 1868 size_t count) 1869 1869 { 1870 - strncpy(v86d_path, buf, PATH_MAX - 1); 1870 + strscpy_pad(v86d_path, buf); 1871 1871 return count; 1872 1872 } 1873 1873 static DRIVER_ATTR_RW(v86d);
+2 -8
drivers/video/hdmi.c
··· 1310 1310 struct device *dev, 1311 1311 const struct hdmi_spd_infoframe *frame) 1312 1312 { 1313 - u8 buf[17]; 1314 - 1315 1313 hdmi_infoframe_log_header(level, dev, 1316 1314 (const struct hdmi_any_infoframe *)frame); 1317 1315 1318 - memset(buf, 0, sizeof(buf)); 1319 - 1320 - strncpy(buf, frame->vendor, 8); 1321 - hdmi_log(" vendor: %s\n", buf); 1322 - strncpy(buf, frame->product, 16); 1323 - hdmi_log(" product: %s\n", buf); 1316 + hdmi_log(" vendor: %.8s\n", frame->vendor); 1317 + hdmi_log(" product: %.16s\n", frame->product); 1324 1318 hdmi_log(" source device information: %s (0x%x)\n", 1325 1319 hdmi_spd_sdi_get_name(frame->sdi), frame->sdi); 1326 1320 }
-2
drivers/video/logo/pnmtologo.c
··· 235 235 fputs("/*\n", out); 236 236 fputs(" * DO NOT EDIT THIS FILE!\n", out); 237 237 fputs(" *\n", out); 238 - fprintf(out, " * It was automatically generated from %s\n", filename); 239 - fputs(" *\n", out); 240 238 fprintf(out, " * Linux logo %s\n", logoname); 241 239 fputs(" */\n\n", out); 242 240 fputs("#include <linux/linux_logo.h>\n\n", out);
-3
include/video/omapfb_dss.h
··· 819 819 omapdss_of_get_next_endpoint(const struct device_node *parent, 820 820 struct device_node *prev); 821 821 822 - struct device_node * 823 - omapdss_of_get_first_endpoint(const struct device_node *parent); 824 - 825 822 struct omap_dss_device * 826 823 omapdss_of_find_source_for_first_ep(struct device_node *node); 827 824 #else