From: Hans de Goede <hdegoede@redhat.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: devel@driverdev.osuosl.org, Hans de Goede <hdegoede@redhat.com>,
Michael Thayer <michael.thayer@oracle.com>,
dri-devel@lists.freedesktop.org
Subject: [PATCH 06/12] staging: vboxvideo: Add fl_flag argument to vbox_fb_pin() helper
Date: Tue, 18 Sep 2018 19:44:32 +0200 [thread overview]
Message-ID: <20180918174438.19780-7-hdegoede@redhat.com> (raw)
In-Reply-To: <20180918174438.19780-1-hdegoede@redhat.com>
Allow specifying where to pin the framebuffer bo, so that this helper can
be used from the cursor code too.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/staging/vboxvideo/vbox_mode.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
index 13696ba19c4f..3beae9d65a09 100644
--- a/drivers/staging/vboxvideo/vbox_mode.c
+++ b/drivers/staging/vboxvideo/vbox_mode.c
@@ -221,7 +221,7 @@ static bool vbox_set_up_input_mapping(struct vbox_private *vbox)
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);
int ret;
@@ -230,7 +230,7 @@ static int vbox_fb_pin(struct drm_framebuffer *fb, u64 *addr)
if (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);
return ret;
}
@@ -267,7 +267,7 @@ static int vbox_crtc_set_base_and_mode(struct drm_crtc *crtc,
int ret;
/* 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) {
DRM_WARN("Error %d pinning new fb, out of video mem?\n", ret);
return ret;
--
2.19.0.rc1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-09-18 17:44 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-18 17:44 [PATCH 00/12] staging: vboxvideo: Preparation work for moving to atomic modesetting Hans de Goede
2018-09-18 17:44 ` [PATCH 01/12] staging: vboxvideo: Let DRM core handle connector registering Hans de Goede
2018-09-18 17:44 ` [PATCH 02/12] staging: vboxvideo: Move setup of modesetting from driver_load to mode_init Hans de Goede
2018-09-18 17:44 ` [PATCH 03/12] staging: vboxvideo: Fold driver_load/unload into probe/remove functions Hans de Goede
2018-09-18 17:44 ` [PATCH 04/12] staging: vboxvideo: Embed drm_device into driver structure Hans de Goede
2018-09-18 17:44 ` [PATCH 05/12] staging: vboxvideo: Fold vbox_drm_resume() into vbox_pm_resume() Hans de Goede
2018-09-18 17:44 ` Hans de Goede [this message]
2018-09-18 17:44 ` [PATCH 07/12] staging: vboxvideo: Expose creation of universal primary plane Hans de Goede
2018-09-18 17:44 ` [PATCH 08/12] staging: vboxvideo: Init fb_info.fix.smem once from fbdev_create Hans de Goede
2018-09-18 17:44 ` [PATCH 09/12] staging: vboxvideo: Move pin / unpin of fb out of vbox_crtc_set_base_and_mode Hans de Goede
2018-09-18 17:44 ` [PATCH 10/12] staging: vboxvideo: Fix NULL ptr deref in vbox_set_up_input_mapping() Hans de Goede
2018-09-18 17:44 ` [PATCH 11/12] staging: vboxvideo: Move bo_[un]resere calls into vbox_bo_[un]pin Hans de Goede
2018-09-18 17:44 ` [PATCH 12/12] staging: vboxvideo: Add vbox_bo_k[un]map helper functions Hans de Goede
2018-09-20 10:32 ` [PATCH 00/12] staging: vboxvideo: Preparation work for moving to atomic modesetting Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180918174438.19780-7-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=devel@driverdev.osuosl.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=michael.thayer@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).