Patchwork drm: Update docs around gem_free_object

login
register
mail settings
Submitter Daniel Vetter
Date July 18, 2017, 6:33 a.m.
Message ID <20170718063337.31942-1-daniel.vetter@ffwll.ch>
Download mbox | patch
Permalink /patch/9847029/
State New
Headers show

Comments

Daniel Vetter - July 18, 2017, 6:33 a.m.
Not all places correctly stated that gem_free_object_unlocked is the
one to use.

Reported-by: Eric Anholt <eric@anholt.net
Cc: Eric Anholt <eric@anholt.net
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 Documentation/gpu/drm-mm.rst         | 2 +-
 drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Eric Anholt - July 18, 2017, 8:01 p.m.
Daniel Vetter <daniel.vetter@ffwll.ch> writes:

> Not all places correctly stated that gem_free_object_unlocked is the
> one to use.
>
> Reported-by: Eric Anholt <eric@anholt.net
> Cc: Eric Anholt <eric@anholt.net

Reviewed-by: Eric Anholt <eric@anholt.net>

Patch

diff --git a/Documentation/gpu/drm-mm.rst b/Documentation/gpu/drm-mm.rst
index 9412798645c1..ce115caea06f 100644
--- a/Documentation/gpu/drm-mm.rst
+++ b/Documentation/gpu/drm-mm.rst
@@ -191,7 +191,7 @@  acquired and release by :c:func:`calling drm_gem_object_get()` and
 holding the lock.
 
 When the last reference to a GEM object is released the GEM core calls
-the :c:type:`struct drm_driver <drm_driver>` gem_free_object
+the :c:type:`struct drm_driver <drm_driver>` gem_free_object_unlocked
 operation. That operation is mandatory for GEM-enabled drivers and must
 free the GEM object and all associated resources.
 
diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
index bc28e7575254..275ab872b34f 100644
--- a/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@ -177,7 +177,7 @@  drm_gem_cma_create_with_handle(struct drm_file *file_priv,
  * This function frees the backing memory of the CMA GEM object, cleans up the
  * GEM object state and frees the memory used to store the object itself.
  * Drivers using the CMA helpers should set this as their
- * &drm_driver.gem_free_object callback.
+ * &drm_driver.gem_free_object_unlocked callback.
  */
 void drm_gem_cma_free_object(struct drm_gem_object *gem_obj)
 {