Changeset 76978 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 24, 2019 2:44:27 PM (6 years ago)

Author:

vboxsync

Message:

Additions/linux/vboxvideo: Pass a new framebuffer to vbox_crtc_do_set_base
bugref:8282: Additions/linux: track kernel changes to vboxvideo in our own tree

This modifies vbox_crtc_do_set_base() to take a new framebuffer to
be activated, instead of the existing framebuffer attached to the crtc.
This change allows the function to be given the new framebuffer from
a page-flip request.

Signed-off-by: Steve Longerbeam <steve_longerbeam@…>
Signed-off-by: Greg Kroah-Hartman <gregkh@…>

Adjusted by the VirtualBox team.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_mode.c (modified) (3 diffs)

trunk/src/VBox/Additions/linux/drm/vbox_mode.c

@@ -203 +203 @@
 
 static int vbox_crtc_set_base(struct drm_crtc *crtc,
-                                 struct drm_framebuffer *old_fb, int x, int y)
+                                 struct drm_framebuffer *old_fb,
+                                 struct drm_framebuffer *new_fb,
+                                 int x, int y)
 {
         struct vbox_private *vbox = crtc->dev->dev_private;
@@ -213 +215 @@
         u64 gpu_addr;
 
-        vbox_fb = to_vbox_framebuffer(CRTC_FB(crtc));
+        vbox_fb = to_vbox_framebuffer(new_fb);
         obj = vbox_fb->obj;
         bo = gem_to_vbox_bo(obj);
@@ -263 +265 @@
 {
         struct vbox_private *vbox = crtc->dev->dev_private;
-        int ret = vbox_crtc_set_base(crtc, old_fb, x, y);
+        int ret = vbox_crtc_set_base(crtc, old_fb, CRTC_FB(crtc), x, y);
         if (ret)
                 return ret;