Commit 30953c4d authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by Alex Deucher
Browse files

drm/amdgpu: Fix style issues in amdgpu_gem.c 



Fixes the following to align to linux coding style:

WARNING: braces {} are not necessary for any arm of this statement
WARNING: Missing a blank line after declarations
ERROR: space prohibited before that close parenthesis ')'
WARNING: unnecessary whitespace before a quoted newline
WARNING: %LX is non-standard C, use %llX

Cc: Christian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0d882e43

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

+19 −19
Original line number Diff line number Diff line
@@ -181,11 +181,10 @@ static int amdgpu_gem_object_open(struct drm_gem_object *obj, 
		return r;



	bo_va = amdgpu_vm_bo_find(vm, abo);

	if (!bo_va) {

	if (!bo_va)

		bo_va = amdgpu_vm_bo_add(adev, vm, abo);

	} else {

	else

		++bo_va->ref_count;

	}

	amdgpu_bo_unreserve(abo);

	return 0;

}
@@ -217,8 +216,8 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj, 


	r = ttm_eu_reserve_buffers(&ticket, &list, false, &duplicates);

	if (r) {

		dev_err(adev->dev, "leaking bo va because "

			"we fail to reserve bo (%ld)\n", r);

		dev_err(adev->dev, "leaking bo va because we fail to reserve bo (%ld)\n",

			r);

		return;

	}

	bo_va = amdgpu_vm_bo_find(vm, bo);
@@ -238,8 +237,8 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj, 


out_unlock:

	if (unlikely(r < 0))

		dev_err(adev->dev, "failed to clear page "

			"tables on GEM object close (%ld)\n", r);

		dev_err(adev->dev, "failed to clear page tables on GEM object close (%ld)\n",

			r);

	ttm_eu_backoff_reservation(&ticket, &list);

}
@@ -463,9 +462,9 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp, 
	struct amdgpu_bo *robj;



	gobj = drm_gem_object_lookup(filp, handle);

	if (gobj == NULL) {

	if (!gobj)

		return -ENOENT;

	}



	robj = gem_to_amdgpu_bo(gobj);

	if (amdgpu_ttm_tt_get_usermm(robj->tbo.ttm) ||

	    (robj->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)) {
@@ -482,6 +481,7 @@ int amdgpu_gem_mmap_ioctl(struct drm_device *dev, void *data, 
{

	union drm_amdgpu_gem_mmap *args = data;

	uint32_t handle = args->in.handle;



	memset(args, 0, sizeof(*args));

	return amdgpu_mode_dumb_mmap(filp, dev, handle, &args->out.addr_ptr);

}
@@ -526,9 +526,9 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data, 
	long ret;



	gobj = drm_gem_object_lookup(filp, handle);

	if (gobj == NULL) {

	if (!gobj)

		return -ENOENT;

	}



	robj = gem_to_amdgpu_bo(gobj);

	ret = dma_resv_wait_timeout(robj->tbo.base.resv, DMA_RESV_USAGE_READ,

				    true, timeout);
@@ -685,7 +685,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 


	if (args->va_address < AMDGPU_VA_RESERVED_SIZE) {

		dev_dbg(dev->dev,

			"va_address 0x%LX is in reserved area 0x%LX\n",

			"va_address 0x%llx is in reserved area 0x%llx\n",

			args->va_address, AMDGPU_VA_RESERVED_SIZE);

		return -EINVAL;

	}
@@ -693,7 +693,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 
	if (args->va_address >= AMDGPU_GMC_HOLE_START &&

	    args->va_address < AMDGPU_GMC_HOLE_END) {

		dev_dbg(dev->dev,

			"va_address 0x%LX is in VA hole 0x%LX-0x%LX\n",

			"va_address 0x%llx is in VA hole 0x%llx-0x%llx\n",

			args->va_address, AMDGPU_GMC_HOLE_START,

			AMDGPU_GMC_HOLE_END);

		return -EINVAL;
@@ -813,9 +813,9 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, 
	int r;



	gobj = drm_gem_object_lookup(filp, args->handle);

	if (gobj == NULL) {

	if (!gobj)

		return -ENOENT;

	}



	robj = gem_to_amdgpu_bo(gobj);



	r = amdgpu_bo_reserve(robj, false);
@@ -941,9 +941,9 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv, 
	r = drm_gem_handle_create(file_priv, gobj, &handle);

	/* drop reference from allocate - handle holds it now */

	drm_gem_object_put(gobj);

	if (r) {

	if (r)

		return r;

	}



	args->handle = handle;

	return 0;

}