aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_framebuffer.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/drm_framebuffer.c')
-rw-r--r--drivers/gpu/drm/drm_framebuffer.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index dfc433450b81..e4909aef75d7 100644
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -52,13 +52,13 @@
52 * metadata fields. 52 * metadata fields.
53 * 53 *
54 * The lifetime of a drm framebuffer is controlled with a reference count, 54 * The lifetime of a drm framebuffer is controlled with a reference count,
55 * drivers can grab additional references with drm_framebuffer_reference() and 55 * drivers can grab additional references with drm_framebuffer_get() and drop
56 * drop them again with drm_framebuffer_unreference(). For driver-private 56 * them again with drm_framebuffer_put(). For driver-private framebuffers for
57 * framebuffers for which the last reference is never dropped (e.g. for the 57 * which the last reference is never dropped (e.g. for the fbdev framebuffer
58 * fbdev framebuffer when the struct &struct drm_framebuffer is embedded into 58 * when the struct &struct drm_framebuffer is embedded into the fbdev helper
59 * the fbdev helper struct) drivers can manually clean up a framebuffer at 59 * struct) drivers can manually clean up a framebuffer at module unload time
60 * module unload time with drm_framebuffer_unregister_private(). But doing this 60 * with drm_framebuffer_unregister_private(). But doing this is not
61 * is not recommended, and it's better to have a normal free-standing &struct 61 * recommended, and it's better to have a normal free-standing &struct
62 * drm_framebuffer. 62 * drm_framebuffer.
63 */ 63 */
64 64
@@ -374,7 +374,7 @@ int drm_mode_rmfb(struct drm_device *dev,
374 mutex_unlock(&file_priv->fbs_lock); 374 mutex_unlock(&file_priv->fbs_lock);
375 375
376 /* drop the reference we picked up in framebuffer lookup */ 376 /* drop the reference we picked up in framebuffer lookup */
377 drm_framebuffer_unreference(fb); 377 drm_framebuffer_put(fb);
378 378
379 /* 379 /*
380 * we now own the reference that was stored in the fbs list 380 * we now own the reference that was stored in the fbs list
@@ -394,12 +394,12 @@ int drm_mode_rmfb(struct drm_device *dev,
394 flush_work(&arg.work); 394 flush_work(&arg.work);
395 destroy_work_on_stack(&arg.work); 395 destroy_work_on_stack(&arg.work);
396 } else 396 } else
397 drm_framebuffer_unreference(fb); 397 drm_framebuffer_put(fb);
398 398
399 return 0; 399 return 0;
400 400
401fail_unref: 401fail_unref:
402 drm_framebuffer_unreference(fb); 402 drm_framebuffer_put(fb);
403 return -ENOENT; 403 return -ENOENT;
404} 404}
405 405
@@ -453,7 +453,7 @@ int drm_mode_getfb(struct drm_device *dev,
453 ret = -ENODEV; 453 ret = -ENODEV;
454 } 454 }
455 455
456 drm_framebuffer_unreference(fb); 456 drm_framebuffer_put(fb);
457 457
458 return ret; 458 return ret;
459} 459}
@@ -540,7 +540,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
540out_err2: 540out_err2:
541 kfree(clips); 541 kfree(clips);
542out_err1: 542out_err1:
543 drm_framebuffer_unreference(fb); 543 drm_framebuffer_put(fb);
544 544
545 return ret; 545 return ret;
546} 546}
@@ -580,7 +580,7 @@ void drm_fb_release(struct drm_file *priv)
580 list_del_init(&fb->filp_head); 580 list_del_init(&fb->filp_head);
581 581
582 /* This drops the fpriv->fbs reference. */ 582 /* This drops the fpriv->fbs reference. */
583 drm_framebuffer_unreference(fb); 583 drm_framebuffer_put(fb);
584 } 584 }
585 } 585 }
586 586
@@ -661,7 +661,7 @@ EXPORT_SYMBOL(drm_framebuffer_init);
661 * 661 *
662 * If successful, this grabs an additional reference to the framebuffer - 662 * If successful, this grabs an additional reference to the framebuffer -
663 * callers need to make sure to eventually unreference the returned framebuffer 663 * callers need to make sure to eventually unreference the returned framebuffer
664 * again, using @drm_framebuffer_unreference. 664 * again, using drm_framebuffer_put().
665 */ 665 */
666struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev, 666struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev,
667 uint32_t id) 667 uint32_t id)
@@ -687,8 +687,8 @@ EXPORT_SYMBOL(drm_framebuffer_lookup);
687 * 687 *
688 * NOTE: This function is deprecated. For driver-private framebuffers it is not 688 * NOTE: This function is deprecated. For driver-private framebuffers it is not
689 * recommended to embed a framebuffer struct info fbdev struct, instead, a 689 * recommended to embed a framebuffer struct info fbdev struct, instead, a
690 * framebuffer pointer is preferred and drm_framebuffer_unreference() should be 690 * framebuffer pointer is preferred and drm_framebuffer_put() should be called
691 * called when the framebuffer is to be cleaned up. 691 * when the framebuffer is to be cleaned up.
692 */ 692 */
693void drm_framebuffer_unregister_private(struct drm_framebuffer *fb) 693void drm_framebuffer_unregister_private(struct drm_framebuffer *fb)
694{ 694{
@@ -797,7 +797,7 @@ void drm_framebuffer_remove(struct drm_framebuffer *fb)
797 } 797 }
798 798
799out: 799out:
800 drm_framebuffer_unreference(fb); 800 drm_framebuffer_put(fb);
801} 801}
802EXPORT_SYMBOL(drm_framebuffer_remove); 802EXPORT_SYMBOL(drm_framebuffer_remove);
803 803