Commit e31dd936 authored by Ohad Sharabi's avatar Ohad Sharabi Committed by Greg Kroah-Hartman
Browse files

habanalabs: remove hdev from hl_ctx_get args 



This argument is unused by the function.

Signed-off-by: default avatarOhad Sharabi <osharabi@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e495e24

drivers/misc/habanalabs/common/command_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int hl_cb_mmap_mem_alloc(struct hl_mmap_mem_buf *buf, gfp_t gfp, void *ar 
	cb->buf->mappable_size = cb->size;

	cb->buf->private = cb;



	hl_ctx_get(cb_args->hdev, cb->ctx);

	hl_ctx_get(cb->ctx);



	if (cb_args->map_cb) {

		if (ctx_id == HL_KERNEL_ASID_ID) {

drivers/misc/habanalabs/common/command_submission.c

+6 −6
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ static int allocate_cs(struct hl_device *hdev, struct hl_ctx *ctx, 
	}



	/* increment refcnt for context */

	hl_ctx_get(hdev, ctx);

	hl_ctx_get(ctx);



	cs->ctx = ctx;

	cs->submitted = false;
@@ -1830,7 +1830,7 @@ static int cs_ioctl_reserve_signals(struct hl_fpriv *hpriv, 


	handle->count = count;



	hl_ctx_get(hdev, hpriv->ctx);

	hl_ctx_get(hpriv->ctx);

	handle->ctx = hpriv->ctx;

	mgr = &hpriv->ctx->sig_mgr;
@@ -2524,7 +2524,7 @@ static int _hl_cs_wait_ioctl(struct hl_device *hdev, struct hl_ctx *ctx, 
	if (timestamp)

		*timestamp = 0;



	hl_ctx_get(hdev, ctx);

	hl_ctx_get(ctx);



	fence = hl_ctx_get_fence(ctx, seq);
@@ -2715,7 +2715,7 @@ static int hl_multi_cs_wait_ioctl(struct hl_fpriv *hpriv, void *data) 
	mcs_data.fence_arr = fence_arr;

	mcs_data.arr_len = seq_arr_len;



	hl_ctx_get(hdev, ctx);

	hl_ctx_get(ctx);



	/* wait (with timeout) for the first CS to be completed */

	mcs_data.timeout_jiffies = hl_usecs64_to_jiffies(args->in.timeout_us);
@@ -2958,7 +2958,7 @@ static int _hl_interrupt_wait_ioctl(struct hl_device *hdev, struct hl_ctx *ctx, 


	timeout = hl_usecs64_to_jiffies(timeout_us);



	hl_ctx_get(hdev, ctx);

	hl_ctx_get(ctx);



	cq_cb = hl_cb_get(cb_mmg, cq_counters_handle);

	if (!cq_cb) {
@@ -3107,7 +3107,7 @@ static int _hl_interrupt_wait_ioctl_user_addr(struct hl_device *hdev, struct hl_ 


	timeout = hl_usecs64_to_jiffies(timeout_us);



	hl_ctx_get(hdev, ctx);

	hl_ctx_get(ctx);



	pend = kzalloc(sizeof(*pend), GFP_KERNEL);

	if (!pend) {

drivers/misc/habanalabs/common/context.c

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ int hl_ctx_init(struct hl_device *hdev, struct hl_ctx *ctx, bool is_kernel_ctx) 
	return rc;

}



void hl_ctx_get(struct hl_device *hdev, struct hl_ctx *ctx)

void hl_ctx_get(struct hl_ctx *ctx)

{

	kref_get(&ctx->refcount);

}
@@ -284,7 +284,7 @@ struct hl_ctx *hl_get_compute_ctx(struct hl_device *hdev) 
		 * immediately once we find him

		 */

		ctx = hpriv->ctx;

		hl_ctx_get(hdev, ctx);

		hl_ctx_get(ctx);

		break;

	}

drivers/misc/habanalabs/common/habanalabs.h

+1 −1
Original line number Diff line number Diff line
@@ -3085,7 +3085,7 @@ int hl_ctx_create(struct hl_device *hdev, struct hl_fpriv *hpriv); 
void hl_ctx_free(struct hl_device *hdev, struct hl_ctx *ctx);

int hl_ctx_init(struct hl_device *hdev, struct hl_ctx *ctx, bool is_kernel_ctx);

void hl_ctx_do_release(struct kref *ref);

void hl_ctx_get(struct hl_device *hdev,	struct hl_ctx *ctx);

void hl_ctx_get(struct hl_ctx *ctx);

int hl_ctx_put(struct hl_ctx *ctx);

struct hl_ctx *hl_get_compute_ctx(struct hl_device *hdev);

struct hl_fence *hl_ctx_get_fence(struct hl_ctx *ctx, u64 seq);

drivers/misc/habanalabs/common/memory.c

+2 −2
Original line number Diff line number Diff line
@@ -1522,7 +1522,7 @@ int hl_hw_block_mmap(struct hl_fpriv *hpriv, struct vm_area_struct *vma) 
	vma->vm_ops = &hw_block_vm_ops;

	vma->vm_private_data = lnode;



	hl_ctx_get(hdev, ctx);

	hl_ctx_get(ctx);



	rc = hdev->asic_funcs->hw_block_mmap(hdev, vma, block_id, block_size);

	if (rc) {
@@ -1832,7 +1832,7 @@ static int export_dmabuf_common(struct hl_ctx *ctx, 
	}



	hl_dmabuf->ctx = ctx;

	hl_ctx_get(hdev, hl_dmabuf->ctx);

	hl_ctx_get(hl_dmabuf->ctx);



	*dmabuf_fd = fd;