summaryrefslogtreecommitdiff
path: root/include/linux/fb.h
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2022-11-23 08:55:56 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2022-11-23 08:55:56 +0100
commit6b0c09eb681773e771965405e0ad711c752f293f (patch)
tree8138ea9225b6831a52356d6014214b894fca2866 /include/linux/fb.h
parent29583dfcd2dd72c766422bd05c16f06c6b1fb356 (diff)
parent3d335a523b938a445a674be24d1dd5c7a4c86fb6 (diff)
Merge drm/drm-next into drm-misc-next-fixes
Backmerging to update drm-misc-next-fixes for the final phase of the release cycle, again. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'include/linux/fb.h')
-rw-r--r--include/linux/fb.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 0aff76bcbb00..8dc9635f5bc1 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -663,6 +663,7 @@ extern void fb_deferred_io_open(struct fb_info *info,
struct inode *inode,
struct file *file);
extern void fb_deferred_io_cleanup(struct fb_info *info);
+extern void fb_deferred_io_schedule_flush(struct fb_info *info);
extern int fb_deferred_io_fsync(struct file *file, loff_t start,
loff_t end, int datasync);
@@ -803,6 +804,15 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
const struct fb_videomode *default_mode,
unsigned int default_bpp);
+#if defined(CONFIG_VIDEO_NOMODESET)
+bool fb_modesetting_disabled(const char *drvname);
+#else
+bool fb_modesetting_disabled(const char *drvname)
+{
+ return false;
+}
+#endif
+
/* Convenience logging macros */
#define fb_err(fb_info, fmt, ...) \
pr_err("fb%d: " fmt, (fb_info)->node, ##__VA_ARGS__)