aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCihangir Akturk <cakturk@gmail.com>2017-08-11 08:33:07 -0400
committerThierry Reding <treding@nvidia.com>2017-08-17 11:57:09 -0400
commit7664b2fa42b5e962dd9ffd9e386dc20cbc966176 (patch)
tree71c3faf42c500271a2e4e07c6b4335bb1a857dc5
parent788ff4b6cfd90fcd9608beccec9c5ed1ff8c4041 (diff)
drm/tegra: switch to drm_*_get(), drm_*_put() helpers
Use drm_*_get() and drm_*_put() helpers instead of drm_*_reference() and drm_*_unreference() helpers. drm_*_reference() and drm_*_unreference() functions are just compatibility alias for drm_*_get() and drm_*_put() and should not be used by new code. So convert all users of compatibility functions to use the new APIs. Generated by: scripts/coccinelle/api/drm-get-put.cocci Signed-off-by: Cihangir Akturk <cakturk@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/tegra/drm.c12
-rw-r--r--drivers/gpu/drm/tegra/fb.c8
-rw-r--r--drivers/gpu/drm/tegra/gem.c10
3 files changed, 15 insertions, 15 deletions
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 518f4b69ea53..eddea778290f 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -304,7 +304,7 @@ host1x_bo_lookup(struct drm_file *file, u32 handle)
304 if (!gem) 304 if (!gem)
305 return NULL; 305 return NULL;
306 306
307 drm_gem_object_unreference_unlocked(gem); 307 drm_gem_object_put_unlocked(gem);
308 308
309 bo = to_tegra_bo(gem); 309 bo = to_tegra_bo(gem);
310 return &bo->base; 310 return &bo->base;
@@ -591,7 +591,7 @@ static int tegra_gem_mmap(struct drm_device *drm, void *data,
591 591
592 args->offset = drm_vma_node_offset_addr(&bo->gem.vma_node); 592 args->offset = drm_vma_node_offset_addr(&bo->gem.vma_node);
593 593
594 drm_gem_object_unreference_unlocked(gem); 594 drm_gem_object_put_unlocked(gem);
595 595
596 return 0; 596 return 0;
597} 597}
@@ -858,7 +858,7 @@ static int tegra_gem_set_tiling(struct drm_device *drm, void *data,
858 bo->tiling.mode = mode; 858 bo->tiling.mode = mode;
859 bo->tiling.value = value; 859 bo->tiling.value = value;
860 860
861 drm_gem_object_unreference_unlocked(gem); 861 drm_gem_object_put_unlocked(gem);
862 862
863 return 0; 863 return 0;
864} 864}
@@ -898,7 +898,7 @@ static int tegra_gem_get_tiling(struct drm_device *drm, void *data,
898 break; 898 break;
899 } 899 }
900 900
901 drm_gem_object_unreference_unlocked(gem); 901 drm_gem_object_put_unlocked(gem);
902 902
903 return err; 903 return err;
904} 904}
@@ -923,7 +923,7 @@ static int tegra_gem_set_flags(struct drm_device *drm, void *data,
923 if (args->flags & DRM_TEGRA_GEM_BOTTOM_UP) 923 if (args->flags & DRM_TEGRA_GEM_BOTTOM_UP)
924 bo->flags |= TEGRA_BO_BOTTOM_UP; 924 bo->flags |= TEGRA_BO_BOTTOM_UP;
925 925
926 drm_gem_object_unreference_unlocked(gem); 926 drm_gem_object_put_unlocked(gem);
927 927
928 return 0; 928 return 0;
929} 929}
@@ -945,7 +945,7 @@ static int tegra_gem_get_flags(struct drm_device *drm, void *data,
945 if (bo->flags & TEGRA_BO_BOTTOM_UP) 945 if (bo->flags & TEGRA_BO_BOTTOM_UP)
946 args->flags |= DRM_TEGRA_GEM_BOTTOM_UP; 946 args->flags |= DRM_TEGRA_GEM_BOTTOM_UP;
947 947
948 drm_gem_object_unreference_unlocked(gem); 948 drm_gem_object_put_unlocked(gem);
949 949
950 return 0; 950 return 0;
951} 951}
diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c
index 25acb73ee728..80540c1c66dc 100644
--- a/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
@@ -88,7 +88,7 @@ static void tegra_fb_destroy(struct drm_framebuffer *framebuffer)
88 if (bo->pages) 88 if (bo->pages)
89 vunmap(bo->vaddr); 89 vunmap(bo->vaddr);
90 90
91 drm_gem_object_unreference_unlocked(&bo->gem); 91 drm_gem_object_put_unlocked(&bo->gem);
92 } 92 }
93 } 93 }
94 94
@@ -195,7 +195,7 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm,
195 195
196unreference: 196unreference:
197 while (i--) 197 while (i--)
198 drm_gem_object_unreference_unlocked(&planes[i]->gem); 198 drm_gem_object_put_unlocked(&planes[i]->gem);
199 199
200 return ERR_PTR(err); 200 return ERR_PTR(err);
201} 201}
@@ -242,7 +242,7 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper,
242 info = drm_fb_helper_alloc_fbi(helper); 242 info = drm_fb_helper_alloc_fbi(helper);
243 if (IS_ERR(info)) { 243 if (IS_ERR(info)) {
244 dev_err(drm->dev, "failed to allocate framebuffer info\n"); 244 dev_err(drm->dev, "failed to allocate framebuffer info\n");
245 drm_gem_object_unreference_unlocked(&bo->gem); 245 drm_gem_object_put_unlocked(&bo->gem);
246 return PTR_ERR(info); 246 return PTR_ERR(info);
247 } 247 }
248 248
@@ -251,7 +251,7 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper,
251 err = PTR_ERR(fbdev->fb); 251 err = PTR_ERR(fbdev->fb);
252 dev_err(drm->dev, "failed to allocate DRM framebuffer: %d\n", 252 dev_err(drm->dev, "failed to allocate DRM framebuffer: %d\n",
253 err); 253 err);
254 drm_gem_object_unreference_unlocked(&bo->gem); 254 drm_gem_object_put_unlocked(&bo->gem);
255 return PTR_ERR(fbdev->fb); 255 return PTR_ERR(fbdev->fb);
256 } 256 }
257 257
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 7a39a355678a..fe77bcd23800 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -24,7 +24,7 @@ static void tegra_bo_put(struct host1x_bo *bo)
24{ 24{
25 struct tegra_bo *obj = host1x_to_tegra_bo(bo); 25 struct tegra_bo *obj = host1x_to_tegra_bo(bo);
26 26
27 drm_gem_object_unreference_unlocked(&obj->gem); 27 drm_gem_object_put_unlocked(&obj->gem);
28} 28}
29 29
30static dma_addr_t tegra_bo_pin(struct host1x_bo *bo, struct sg_table **sgt) 30static dma_addr_t tegra_bo_pin(struct host1x_bo *bo, struct sg_table **sgt)
@@ -95,7 +95,7 @@ static struct host1x_bo *tegra_bo_get(struct host1x_bo *bo)
95{ 95{
96 struct tegra_bo *obj = host1x_to_tegra_bo(bo); 96 struct tegra_bo *obj = host1x_to_tegra_bo(bo);
97 97
98 drm_gem_object_reference(&obj->gem); 98 drm_gem_object_get(&obj->gem);
99 99
100 return bo; 100 return bo;
101} 101}
@@ -325,7 +325,7 @@ struct tegra_bo *tegra_bo_create_with_handle(struct drm_file *file,
325 return ERR_PTR(err); 325 return ERR_PTR(err);
326 } 326 }
327 327
328 drm_gem_object_unreference_unlocked(&bo->gem); 328 drm_gem_object_put_unlocked(&bo->gem);
329 329
330 return bo; 330 return bo;
331} 331}
@@ -439,7 +439,7 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,
439 439
440 *offset = drm_vma_node_offset_addr(&bo->gem.vma_node); 440 *offset = drm_vma_node_offset_addr(&bo->gem.vma_node);
441 441
442 drm_gem_object_unreference_unlocked(gem); 442 drm_gem_object_put_unlocked(gem);
443 443
444 return 0; 444 return 0;
445} 445}
@@ -654,7 +654,7 @@ struct drm_gem_object *tegra_gem_prime_import(struct drm_device *drm,
654 struct drm_gem_object *gem = buf->priv; 654 struct drm_gem_object *gem = buf->priv;
655 655
656 if (gem->dev == drm) { 656 if (gem->dev == drm) {
657 drm_gem_object_reference(gem); 657 drm_gem_object_get(gem);
658 return gem; 658 return gem;
659 } 659 }
660 } 660 }