diff options
| author |   Thomas Zimmermann <tzimmermann@suse.de> | 2019-05-21 13:08:30 +0200 |
|---|---|---|
| committer |   Gerd Hoffmann <kraxel@redhat.com> | 2019-05-22 12:43:29 +0200 |
| commit | cb1f8814bbfcc2d0d7c499530e3d878ba04e4af2 (patch) | |
| tree | cd684ec8fd8d9a94b0180a5b464a1a946c3dcd2d /drivers/gpu/drm/mgag200/mgag200_fb.c | |
| parent | drm: Replace drm_gem_vram_push_to_system() with kunmap + unpin (diff) | |
| download | linux-dev-cb1f8814bbfcc2d0d7c499530e3d878ba04e4af2.tar.xz linux-dev-cb1f8814bbfcc2d0d7c499530e3d878ba04e4af2.zip | |
drm: Rename reserve/unreserve to lock/unlock in GEM VRAM helpers
To align with the rest of DRM terminology, the GEM VRAM helpers now use
lock and unlock in places where reserve and unreserve where used before.
All callers have been adapted.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20190521110831.20200-3-tzimmermann@suse.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/mgag200/mgag200_fb.c')
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_fb.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c index 87217bdce9f8..97c575a9a86f 100644 --- a/drivers/gpu/drm/mgag200/mgag200_fb.c +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c @@ -36,13 +36,12 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev, obj = mfbdev->mfb.obj; gbo = drm_gem_vram_of_gem(obj); - /* - * try and reserve the BO, if we fail with busy - * then the BO is being moved and we should - * store up the damage until later. + /* Try to lock the BO. If we fail with -EBUSY then + * the BO is being moved and we should store up the + * damage until later. */ if (drm_can_sleep()) - ret = drm_gem_vram_reserve(gbo, true); + ret = drm_gem_vram_lock(gbo, true); if (ret) { if (ret != -EBUSY) return; @@ -101,7 +100,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev, drm_gem_vram_kunmap(gbo); out: - drm_gem_vram_unreserve(gbo); + drm_gem_vram_unlock(gbo); } static void mga_fillrect(struct fb_info *info, |