diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-18 12:53:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-18 12:53:22 +0200 |
| commit | f4960b002ce81f8e51245bfad0fb7eb4103962ff (patch) | |
| tree | d292d434e07969582b61ba6df96e1994cf39c1ee /include/linux | |
| parent | eec91e22fe9f05846a7410beab671f26bef7ba7b (diff) | |
| parent | de5e89b6654ea0b021a5737e0f55fc6bed625550 (diff) | |
Merge tag 'fbdev-for-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev updates from Helge Deller:
- video: Reduce code when CONFIG_HAS_IOPORT=n
- xenfb: Fix crash by assigning fb_info->device
- pxafb: Fix possible use after free in pxafb_task()
- efifb: Introduce and use new devm_register_framebuffer() function
- mmpfb: Utilize devm_clk_get_enabled() helpers
- various typo fixes and code cleanups
* tag 'fbdev-for-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
fbdev: omapfb: Fix typo in comment
fbdev: pxafb: Fix possible use after free in pxafb_task()
fbdev: xen-fbfront: Assign fb_info->device
fbdev: hyperv_fb: Convert comma to semicolon
fbdev: imsttfb: convert comma to semicolon
fbdev: pxa3xx-gcu: Convert comma to semicolon
fbdev: efifb: Use driver-private screen_info for sysfs
fbdev: efifb: Use devm_register_framebuffer()
fbdev: efifb: Register sysfs groups through driver core
fbdev: Introduce devm_register_framebuffer()
fbdev: omapfb: Use sysfs_emit_at() to simplify code
fbdev: omapfb: panel-sony-acx565akm: Simplify show_cabc_available_modes()
fbdev: mmp: Use devm_clk_get_enabled() helpers
fbdev: hpfb: Fix an error handling path in hpfb_dio_probe()
video: Handle HAS_IOPORT dependencies
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index db7d97b10964..abf6643ebcaf 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -601,6 +601,7 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf, /* fbmem.c */ extern int register_framebuffer(struct fb_info *fb_info); extern void unregister_framebuffer(struct fb_info *fb_info); +extern int devm_register_framebuffer(struct device *dev, struct fb_info *fb_info); extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size); extern void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx, u32 height, u32 shift_high, u32 shift_low, u32 mod); |