Commit ba67f54d authored by Steve Longerbeam's avatar Steve Longerbeam Committed by Greg Kroah-Hartman

staging: vboxvideo: Pass a new framebuffer to vbox_crtc_do_set_base

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: default avatarSteve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 548b9f03
...@@ -222,7 +222,9 @@ static bool vbox_set_up_input_mapping(struct vbox_private *vbox) ...@@ -222,7 +222,9 @@ static bool vbox_set_up_input_mapping(struct vbox_private *vbox)
} }
static int vbox_crtc_do_set_base(struct drm_crtc *crtc, static int vbox_crtc_do_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; struct vbox_private *vbox = crtc->dev->dev_private;
struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc); struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
...@@ -245,7 +247,7 @@ static int vbox_crtc_do_set_base(struct drm_crtc *crtc, ...@@ -245,7 +247,7 @@ static int vbox_crtc_do_set_base(struct drm_crtc *crtc,
vbox_bo_unreserve(bo); vbox_bo_unreserve(bo);
} }
vbox_fb = to_vbox_framebuffer(CRTC_FB(crtc)); vbox_fb = to_vbox_framebuffer(new_fb);
obj = vbox_fb->obj; obj = vbox_fb->obj;
bo = gem_to_vbox_bo(obj); bo = gem_to_vbox_bo(obj);
...@@ -281,7 +283,7 @@ static int vbox_crtc_do_set_base(struct drm_crtc *crtc, ...@@ -281,7 +283,7 @@ static int vbox_crtc_do_set_base(struct drm_crtc *crtc,
static int vbox_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, static int vbox_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
struct drm_framebuffer *old_fb) struct drm_framebuffer *old_fb)
{ {
return vbox_crtc_do_set_base(crtc, old_fb, x, y); return vbox_crtc_do_set_base(crtc, old_fb, CRTC_FB(crtc), x, y);
} }
static int vbox_crtc_mode_set(struct drm_crtc *crtc, static int vbox_crtc_mode_set(struct drm_crtc *crtc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment