Commit c4c10a68 authored by Rajneesh Bhardwaj's avatar Rajneesh Bhardwaj Committed by Alex Deucher
Browse files

drm/amdgpu: Avoid direct cast to amdgpu_ttm_tt 



For typesafety, use container_of() instead of implicit cast from struct
ttm_tt to struct amdgpu_ttm_tt.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarRajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4e64b529

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+18 −16
Original line number Diff line number Diff line
@@ -637,6 +637,8 @@ struct amdgpu_ttm_tt { 
#endif

};



#define ttm_to_amdgpu_ttm_tt(ptr)	container_of(ptr, struct amdgpu_ttm_tt, ttm)



#ifdef CONFIG_DRM_AMDGPU_USERPTR

/*

 * amdgpu_ttm_tt_get_user_pages - get device accessible pages that back user
@@ -648,7 +650,7 @@ struct amdgpu_ttm_tt { 
int amdgpu_ttm_tt_get_user_pages(struct amdgpu_bo *bo, struct page **pages)

{

	struct ttm_tt *ttm = bo->tbo.ttm;

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);

	unsigned long start = gtt->userptr;

	struct vm_area_struct *vma;

	struct mm_struct *mm;
@@ -702,7 +704,7 @@ int amdgpu_ttm_tt_get_user_pages(struct amdgpu_bo *bo, struct page **pages) 
 */

bool amdgpu_ttm_tt_get_user_pages_done(struct ttm_tt *ttm)

{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);

	bool r = false;



	if (!gtt || !gtt->userptr)
@@ -751,7 +753,7 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_device *bdev, 
				     struct ttm_tt *ttm)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);

	int write = !(gtt->userflags & AMDGPU_GEM_USERPTR_READONLY);

	enum dma_data_direction direction = write ?

		DMA_BIDIRECTIONAL : DMA_TO_DEVICE;
@@ -788,7 +790,7 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_device *bdev, 
					struct ttm_tt *ttm)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);

	int write = !(gtt->userflags & AMDGPU_GEM_USERPTR_READONLY);

	enum dma_data_direction direction = write ?

		DMA_BIDIRECTIONAL : DMA_TO_DEVICE;
@@ -822,7 +824,7 @@ static void amdgpu_ttm_gart_bind(struct amdgpu_device *adev, 
{

	struct amdgpu_bo *abo = ttm_to_amdgpu_bo(tbo);

	struct ttm_tt *ttm = tbo->ttm;

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);



	if (amdgpu_bo_encrypted(abo))

		flags |= AMDGPU_PTE_TMZ;
@@ -860,7 +862,7 @@ static int amdgpu_ttm_backend_bind(struct ttm_device *bdev, 
				   struct ttm_resource *bo_mem)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);

	struct amdgpu_ttm_tt *gtt = (void*)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);

	uint64_t flags;

	int r;
@@ -927,7 +929,7 @@ int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo) 
{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);

	struct ttm_operation_ctx ctx = { false, false };

	struct amdgpu_ttm_tt *gtt = (void *)bo->ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(bo->ttm);

	struct ttm_placement placement;

	struct ttm_place placements;

	struct ttm_resource *tmp;
@@ -998,7 +1000,7 @@ static void amdgpu_ttm_backend_unbind(struct ttm_device *bdev, 
				      struct ttm_tt *ttm)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);



	/* if the pages have userptr pinning then clear that first */

	if (gtt->userptr) {
@@ -1025,7 +1027,7 @@ static void amdgpu_ttm_backend_unbind(struct ttm_device *bdev, 
static void amdgpu_ttm_backend_destroy(struct ttm_device *bdev,

				       struct ttm_tt *ttm)

{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);



	if (gtt->usertask)

		put_task_struct(gtt->usertask);
@@ -1079,7 +1081,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_device *bdev, 
				  struct ttm_operation_ctx *ctx)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);

	pgoff_t i;

	int ret;
@@ -1113,7 +1115,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_device *bdev, 
static void amdgpu_ttm_tt_unpopulate(struct ttm_device *bdev,

				     struct ttm_tt *ttm)

{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);

	struct amdgpu_device *adev;

	pgoff_t i;
@@ -1182,7 +1184,7 @@ int amdgpu_ttm_tt_set_userptr(struct ttm_buffer_object *bo, 
	/* Set TTM_TT_FLAG_EXTERNAL before populate but after create. */

	bo->ttm->page_flags |= TTM_TT_FLAG_EXTERNAL;



	gtt = (void *)bo->ttm;

	gtt = ttm_to_amdgpu_ttm_tt(bo->ttm);

	gtt->userptr = addr;

	gtt->userflags = flags;
@@ -1199,7 +1201,7 @@ int amdgpu_ttm_tt_set_userptr(struct ttm_buffer_object *bo, 
 */

struct mm_struct *amdgpu_ttm_tt_get_usermm(struct ttm_tt *ttm)

{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);



	if (gtt == NULL)

		return NULL;
@@ -1218,7 +1220,7 @@ struct mm_struct *amdgpu_ttm_tt_get_usermm(struct ttm_tt *ttm) 
bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start,

				  unsigned long end, unsigned long *userptr)

{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);

	unsigned long size;



	if (gtt == NULL || !gtt->userptr)
@@ -1241,7 +1243,7 @@ bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start, 
 */

bool amdgpu_ttm_tt_is_userptr(struct ttm_tt *ttm)

{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);



	if (gtt == NULL || !gtt->userptr)

		return false;
@@ -1254,7 +1256,7 @@ bool amdgpu_ttm_tt_is_userptr(struct ttm_tt *ttm) 
 */

bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm)

{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_ttm_tt *gtt = ttm_to_amdgpu_ttm_tt(ttm);



	if (gtt == NULL)

		return false;