From 6fa94ff38257a3560bf477733e747a134e9cd378 Mon Sep 17 00:00:00 2001 From: Samantha Tran Date: Thu, 17 Sep 2020 20:55:38 -0700 Subject: [PATCH] disp: msm: rename drm_gem_object_put functions Commit b5d250744ccc ("drm/gem: fold drm_gem_object_put_unlocked and __drm_gem_object_put()"), commit eecd7fd8bf58 (drm/gem: add _locked suffix to drm_gem_object_put", commit be6ee102341b ("drm: remove _unlocked suffix in drm_object_put_unlocked") updates the drm_gem_object_put call APIs. This change updates the relevant changes to the msm driver. Change-Id: I006b51b5f3d1f8b2e88ed7b4c73b5a98afcaf455 Signed-off-by: Samantha Tran Signed-off-by: Nilaan Gunabalachandran --- msm/msm_drv.c | 4 ++-- msm/msm_fb.c | 4 ++-- msm/msm_gem.c | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/msm/msm_drv.c b/msm/msm_drv.c index 53fdbad942..0ce9c21e8a 100644 --- a/msm/msm_drv.c +++ b/msm/msm_drv.c @@ -1174,7 +1174,7 @@ static int msm_ioctl_gem_cpu_prep(struct drm_device *dev, void *data, ret = msm_gem_cpu_prep(obj, args->op, &timeout); - drm_gem_object_put_unlocked(obj); + drm_gem_object_put(obj); return ret; } @@ -1192,7 +1192,7 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data, ret = msm_gem_cpu_fini(obj); - drm_gem_object_put_unlocked(obj); + drm_gem_object_put(obj); return ret; } diff --git a/msm/msm_fb.c b/msm/msm_fb.c index 5c59ac17f3..779a6936be 100644 --- a/msm/msm_fb.c +++ b/msm/msm_fb.c @@ -221,7 +221,7 @@ struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev, out_unref: for (i = 0; i < n; i++) - drm_gem_object_put_unlocked(bos[i]); + drm_gem_object_put(bos[i]); return ERR_PTR(ret); } @@ -372,7 +372,7 @@ msm_alloc_stolen_fb(struct drm_device *dev, int w, int h, int p, uint32_t format /* note: if fb creation failed, we can't rely on fb destroy * to unref the bo: */ - drm_gem_object_put_unlocked(bo); + drm_gem_object_put(bo); return ERR_CAST(fb); } diff --git a/msm/msm_gem.c b/msm/msm_gem.c index 9ccff79644..fcdaa8da10 100644 --- a/msm/msm_gem.c +++ b/msm/msm_gem.c @@ -701,7 +701,7 @@ int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, *offset = msm_gem_mmap_offset(obj); - drm_gem_object_put_unlocked(obj); + drm_gem_object_put(obj); fail: return ret; @@ -1067,7 +1067,7 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file, ret = drm_gem_handle_create(file, obj, handle); /* drop reference from allocate - handle holds it now */ - drm_gem_object_put_unlocked(obj); + drm_gem_object_put(obj); return ret; } @@ -1191,7 +1191,7 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev, return obj; fail: - drm_gem_object_put_unlocked(obj); + drm_gem_object_put(obj); return ERR_PTR(ret); } @@ -1309,7 +1309,7 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, return obj; fail: - drm_gem_object_put_unlocked(obj); + drm_gem_object_put(obj); return ERR_PTR(ret); } @@ -1343,9 +1343,9 @@ static void *_msm_gem_kernel_new(struct drm_device *dev, uint32_t size, return vaddr; err: if (locked) - drm_gem_object_put(obj); + drm_gem_object_put_locked(obj); else - drm_gem_object_put_unlocked(obj); + drm_gem_object_put(obj); return ERR_PTR(ret); @@ -1375,9 +1375,9 @@ void msm_gem_kernel_put(struct drm_gem_object *bo, msm_gem_unpin_iova(bo, aspace); if (locked) - drm_gem_object_put(bo); + drm_gem_object_put_locked(bo); else - drm_gem_object_put_unlocked(bo); + drm_gem_object_put(bo); } void msm_gem_object_set_name(struct drm_gem_object *bo, const char *fmt, ...)