Commit 735cb8f

committed

Additions: Linux: vboxvideo: Introduce initial support for kernel 6.17, bugref:10950.

svn:sync-xref-src-repo-rev: r170175

1 parent 5eca152 commit 735cb8fCopy full SHA for 735cb8f

File tree

-2

lines changed

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Id: vbox_main.c 106061 2024年09月16日 14:03:52Z knut.osmundsen@oracle.com $ */`
	`1`	`+/* $Id: vbox_main.c 110672 2025年08月11日 12:54:33Z vadim.galitsyn@oracle.com $ */`
`2`	`2`	`/** @file`
`3`	`3`	`* VirtualBox Additions Linux kernel video driver`
`4`	`4`	`*/`
`@@ -180,7 +180,9 @@ int vbox_framebuffer_init(struct drm_device *dev,`
`180`	`180`	`{`
`181`	`181`	`int ret;`
`182`	`182`
`183`		`-#if RTLNX_VER_MIN(4,11,0) \|\| RTLNX_RHEL_MAJ_PREREQ(7,5)`
	`183`	`+#if RTLNX_VER_MIN(6,17,0)`
	`184`	`+ drm_helper_mode_fill_fb_struct(dev, &vbox_fb->base, NULL, mode_cmd);`
	`185`	`+#elif RTLNX_VER_MIN(4,11,0) \|\| RTLNX_RHEL_MAJ_PREREQ(7,5)`
`184`	`186`	`drm_helper_mode_fill_fb_struct(dev, &vbox_fb->base, mode_cmd);`
`185`	`187`	`#else`
`186`	`188`	`drm_helper_mode_fill_fb_struct(&vbox_fb->base, mode_cmd);`
`@@ -198,6 +200,9 @@ int vbox_framebuffer_init(struct drm_device *dev,`
`198`	`200`	`static struct drm_framebuffer *vbox_user_framebuffer_create(`
`199`	`201`	`struct drm_device *dev,`
`200`	`202`	`struct drm_file *filp,`
	`203`	`+#if RTLNX_VER_MIN(6,17,0)`
	`204`	`+ const struct drm_format_info *info,`
	`205`	`+#endif`
`201`	`206`	`#if RTLNX_VER_MIN(4,5,0) \|\| RTLNX_RHEL_MAJ_PREREQ(7,3)`
`202`	`207`	`const struct drm_mode_fb_cmd2 *mode_cmd)`
`203`	`208`	`#else`

Comments

(0)