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

+2 -4

drivers/video/fbdev/au1100fb.c

··· 560 560 /* Blank the LCD */ 561 561 au1100fb_fb_blank(VESA_POWERDOWN, &fbdev->info); 562 562 563 - if (fbdev->lcdclk) 564 - clk_disable(fbdev->lcdclk); 563 + clk_disable(fbdev->lcdclk); 565 564 566 565 memcpy(&fbregs, fbdev->regs, sizeof(struct au1100fb_regs)); 567 566 ··· 576 577 577 578 memcpy(fbdev->regs, &fbregs, sizeof(struct au1100fb_regs)); 578 579 579 - if (fbdev->lcdclk) 580 - clk_enable(fbdev->lcdclk); 580 + clk_enable(fbdev->lcdclk); 581 581 582 582 /* Unblank the LCD */ 583 583 au1100fb_fb_blank(VESA_NO_BLANKING, &fbdev->info);

-6

drivers/video/fbdev/cirrusfb.c

··· 2184 2184 .id_table = cirrusfb_pci_table, 2185 2185 .probe = cirrusfb_pci_register, 2186 2186 .remove = cirrusfb_pci_unregister, 2187 - #ifdef CONFIG_PM 2188 - #if 0 2189 - .suspend = cirrusfb_pci_suspend, 2190 - .resume = cirrusfb_pci_resume, 2191 - #endif 2192 - #endif 2193 2187 }; 2194 2188 #endif /* CONFIG_PCI */ 2195 2189

+2 -2

drivers/video/fbdev/intelfb/intelfbdrv.c

··· 472 472 struct fb_info *info; 473 473 struct intelfb_info *dinfo; 474 474 int i, err, dvo; 475 - int aperture_size, stolen_size; 475 + int aperture_size, stolen_size = 0; 476 476 struct agp_kern_info gtt_info; 477 477 int agp_memtype; 478 478 const char *s; ··· 571 571 return -ENODEV; 572 572 } 573 573 574 - if (intelfbhw_get_memory(pdev, &aperture_size,&stolen_size)) { 574 + if (intelfbhw_get_memory(pdev, &aperture_size, &stolen_size)) { 575 575 cleanup(dinfo); 576 576 return -ENODEV; 577 577 }

+5 -7

drivers/video/fbdev/intelfb/intelfbhw.c

··· 201 201 case PCI_DEVICE_ID_INTEL_945GME: 202 202 case PCI_DEVICE_ID_INTEL_965G: 203 203 case PCI_DEVICE_ID_INTEL_965GM: 204 - /* 915, 945 and 965 chipsets support a 256MB aperture. 205 - Aperture size is determined by inspected the 206 - base address of the aperture. */ 207 - if (pci_resource_start(pdev, 2) & 0x08000000) 208 - *aperture_size = MB(128); 209 - else 210 - *aperture_size = MB(256); 204 + /* 205 + * 915, 945 and 965 chipsets support 64MB, 128MB or 256MB 206 + * aperture. Determine size from PCI resource length. 207 + */ 208 + *aperture_size = pci_resource_len(pdev, 2); 211 209 break; 212 210 default: 213 211 if ((tmp & INTEL_GMCH_MEM_MASK) == INTEL_GMCH_MEM_64M)

+1 -1

drivers/video/fbdev/omap/sossi.c

··· 359 359 int bus_pick_count, bus_pick_width; 360 360 361 361 /* 362 - * We set explicitly the the bus_pick_count as well, although 362 + * We set explicitly the bus_pick_count as well, although 363 363 * with remapping/reordering disabled it will be calculated by HW 364 364 * as (32 / bus_pick_width). 365 365 */

+1 -1

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

··· 143 143 /* 144 144 * In OMAP5+, the HFBITCLK must be divided by 2 before issuing the 145 145 * HDMI_PHYPWRCMD_LDOON command. 146 - */ 146 + */ 147 147 if (phy_feat->bist_ctrl) 148 148 REG_FLD_MOD(phy->base, HDMI_TXPHY_BIST_CONTROL, 1, 11, 11); 149 149

+1 -1

drivers/video/fbdev/pxa3xx-gcu.c

··· 381 381 struct pxa3xx_gcu_batch *buffer; 382 382 struct pxa3xx_gcu_priv *priv = to_pxa3xx_gcu_priv(file); 383 383 384 - int words = count / 4; 384 + size_t words = count / 4; 385 385 386 386 /* Does not need to be atomic. There's a lock in user space, 387 387 * but anyhow, this is just for statistics. */

+1 -2

drivers/video/fbdev/simplefb.c

··· 237 237 if (IS_ERR(clock)) { 238 238 if (PTR_ERR(clock) == -EPROBE_DEFER) { 239 239 while (--i >= 0) { 240 - if (par->clks[i]) 241 - clk_put(par->clks[i]); 240 + clk_put(par->clks[i]); 242 241 } 243 242 kfree(par->clks); 244 243 return -EPROBE_DEFER;

+8 -7

drivers/video/fbdev/skeletonfb.c

··· 96 96 97 97 /* 98 98 * Modern graphical hardware not only supports pipelines but some 99 - * also support multiple monitors where each display can have its 99 + * also support multiple monitors where each display can have 100 100 * its own unique data. In this case each display could be 101 101 * represented by a separate framebuffer device thus a separate 102 102 * struct fb_info. Now the struct xxx_par represents the graphics ··· 838 838 * 839 839 * See Documentation/driver-api/pm/devices.rst for more information 840 840 */ 841 - static int xxxfb_suspend(struct pci_dev *dev, pm_message_t msg) 841 + static int xxxfb_suspend(struct device *dev) 842 842 { 843 - struct fb_info *info = pci_get_drvdata(dev); 843 + struct fb_info *info = dev_get_drvdata(dev); 844 844 struct xxxfb_par *par = info->par; 845 845 846 846 /* suspend here */ ··· 853 853 * 854 854 * See Documentation/driver-api/pm/devices.rst for more information 855 855 */ 856 - static int xxxfb_resume(struct pci_dev *dev) 856 + static int xxxfb_resume(struct device *dev) 857 857 { 858 - struct fb_info *info = pci_get_drvdata(dev); 858 + struct fb_info *info = dev_get_drvdata(dev); 859 859 struct xxxfb_par *par = info->par; 860 860 861 861 /* resume here */ ··· 873 873 { 0, } 874 874 }; 875 875 876 + static SIMPLE_DEV_PM_OPS(xxxfb_pm_ops, xxxfb_suspend, xxxfb_resume); 877 + 876 878 /* For PCI drivers */ 877 879 static struct pci_driver xxxfb_driver = { 878 880 .name = "xxxfb", 879 881 .id_table = xxxfb_id_table, 880 882 .probe = xxxfb_probe, 881 883 .remove = xxxfb_remove, 882 - .suspend = xxxfb_suspend, /* optional but recommended */ 883 - .resume = xxxfb_resume, /* optional but recommended */ 884 + .driver.pm = xxxfb_pm_ops, /* optional but recommended */ 884 885 }; 885 886 886 887 MODULE_DEVICE_TABLE(pci, xxxfb_id_table);

Configure Feed

Configure Feed