summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2024-08-30 04:28:00 +0300
committerDave Airlie <airlied@redhat.com>2024-08-30 04:28:11 +0300
commit27f5b729cb56e46d8beca47c227c0edf1e958fbb (patch)
tree07aa373fe5e76cea6ca2eed7a1c9eaf50c0a1f72 /include/linux
parentdde72a5d4fdf2e18fedb4b2abfba5f7e86bcb7c8 (diff)
parent9d824c7fce58f59982228aa85b0376b113cdfa35 (diff)
downloadlinux-27f5b729cb56e46d8beca47c227c0edf1e958fbb.tar.xz
Merge tag 'drm-misc-fixes-2024-08-29' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
A revert for a previous TTM commit causing stuttering, 3 fixes for vmwgfx related to buffer operations, a fix for video/aperture with non-VGA primary devices, and a preemption status fix for v3d Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maxime Ripard <mripard@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240829-efficient-swift-from-lemuria-f60c05@houat
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sysfb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/sysfb.h b/include/linux/sysfb.h
index c9cb657dad08..bef5f06a91de 100644
--- a/include/linux/sysfb.h
+++ b/include/linux/sysfb.h
@@ -58,11 +58,11 @@ struct efifb_dmi_info {
#ifdef CONFIG_SYSFB
-void sysfb_disable(void);
+void sysfb_disable(struct device *dev);
#else /* CONFIG_SYSFB */
-static inline void sysfb_disable(void)
+static inline void sysfb_disable(struct device *dev)
{
}