Commit eb314613 authored by Christian König's avatar Christian König
Browse files

drm/ttm: revert "Export ttm_bo_get_unless_zero()" 



This reverts commit 24dc64c1.

Shouldn't be needed by drivers any more.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarDanilo Krummrich <dakr@kernel.org>
Reviewed-by: default avatarSimona Vetter <simona.vetter@ffwll.ch>
Link: https://lore.kernel.org/r/20240723121750.2086-6-christian.koenig@amd.com
parent c06cb85a

drivers/gpu/drm/ttm/ttm_bo.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <linux/dma-resv.h>



#include "ttm_module.h"

#include "ttm_bo_internal.h"



static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,

					struct ttm_placement *placement)

drivers/gpu/drm/ttm/ttm_bo_internal.h

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2018 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 *

 */



#ifndef _TTM_BO_INTERNAL_H_

#define _TTM_BO_INTERNAL_H_



#include <drm/ttm/ttm_bo.h>



/**

 * ttm_bo_get_unless_zero - reference a struct ttm_buffer_object unless

 * its refcount has already reached zero.

 * @bo: The buffer object.

 *

 * Used to reference a TTM buffer object in lookups where the object is removed

 * from the lookup structure during the destructor and for RCU lookups.

 *

 * Returns: @bo if the referencing was successful, NULL otherwise.

 */

static inline __must_check struct ttm_buffer_object *

ttm_bo_get_unless_zero(struct ttm_buffer_object *bo)

{

	if (!kref_get_unless_zero(&bo->kref))

		return NULL;

	return bo;

}



#endif

drivers/gpu/drm/ttm/ttm_bo_util.c

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 


#include <drm/drm_cache.h>



#include "ttm_bo_internal.h"



struct ttm_transfer_obj {

	struct ttm_buffer_object base;

	struct ttm_buffer_object *bo;

drivers/gpu/drm/ttm/ttm_device.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <drm/ttm/ttm_placement.h>



#include "ttm_module.h"

#include "ttm_bo_internal.h"



/*

 * ttm_global_mutex - protecting the global state

include/drm/ttm/ttm_bo.h

+0 −18
Original line number Diff line number Diff line
@@ -254,24 +254,6 @@ static inline void ttm_bo_get(struct ttm_buffer_object *bo) 
	kref_get(&bo->kref);

}



/**

 * ttm_bo_get_unless_zero - reference a struct ttm_buffer_object unless

 * its refcount has already reached zero.

 * @bo: The buffer object.

 *

 * Used to reference a TTM buffer object in lookups where the object is removed

 * from the lookup structure during the destructor and for RCU lookups.

 *

 * Returns: @bo if the referencing was successful, NULL otherwise.

 */

static inline __must_check struct ttm_buffer_object *

ttm_bo_get_unless_zero(struct ttm_buffer_object *bo)

{

	if (!kref_get_unless_zero(&bo->kref))

		return NULL;

	return bo;

}



/**

 * ttm_bo_reserve:

 *