Commit f4d6d90f authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman

staging: vboxvideo: Add fl_flag argument to vbox_fb_pin() helper

Allow specifying where to pin the framebuffer bo, so that this helper can
be used from the cursor code too.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3498ea8b
...@@ -221,7 +221,7 @@ static bool vbox_set_up_input_mapping(struct vbox_private *vbox) ...@@ -221,7 +221,7 @@ static bool vbox_set_up_input_mapping(struct vbox_private *vbox)
return old_single_framebuffer != vbox->single_framebuffer; return old_single_framebuffer != vbox->single_framebuffer;
} }
static int vbox_fb_pin(struct drm_framebuffer *fb, u64 *addr) static int vbox_fb_pin(struct drm_framebuffer *fb, u32 pl_flag, u64 *addr)
{ {
struct vbox_bo *bo = gem_to_vbox_bo(to_vbox_framebuffer(fb)->obj); struct vbox_bo *bo = gem_to_vbox_bo(to_vbox_framebuffer(fb)->obj);
int ret; int ret;
...@@ -230,7 +230,7 @@ static int vbox_fb_pin(struct drm_framebuffer *fb, u64 *addr) ...@@ -230,7 +230,7 @@ static int vbox_fb_pin(struct drm_framebuffer *fb, u64 *addr)
if (ret) if (ret)
return ret; return ret;
ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, addr); ret = vbox_bo_pin(bo, pl_flag, addr);
vbox_bo_unreserve(bo); vbox_bo_unreserve(bo);
return ret; return ret;
} }
...@@ -267,7 +267,7 @@ static int vbox_crtc_set_base_and_mode(struct drm_crtc *crtc, ...@@ -267,7 +267,7 @@ static int vbox_crtc_set_base_and_mode(struct drm_crtc *crtc,
int ret; int ret;
/* Prepare: pin the new framebuffer bo */ /* Prepare: pin the new framebuffer bo */
ret = vbox_fb_pin(new_fb, &gpu_addr); ret = vbox_fb_pin(new_fb, TTM_PL_FLAG_VRAM, &gpu_addr);
if (ret) { if (ret) {
DRM_WARN("Error %d pinning new fb, out of video mem?\n", ret); DRM_WARN("Error %d pinning new fb, out of video mem?\n", ret);
return ret; return ret;
......
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