Merge "msm: sde: fix format of prints in sde rotator" (59ebc96c) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/media/platform/msm/sde/rotator/sde_rotator_base.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -394,7 +394,7 @@ struct reg_bus_client sde_reg_bus_vote_client_create(char client_name)
		strlcpy(client->name, client_name, MAX_CLIENT_NAME_LEN);
		client->usecase_ndx = VOTE_INDEX_DISABLE;
		client->id = id;
		SDEROT_DBG("bus vote client %s created:%p id :%d\n", client_name,
		SDEROT_DBG("bus vote client %s created:%pK id :%d\n", client_name,
		client, id);
		id++;
		list_add(&client->list, &sde_res->reg_bus_clist);
		@@ -410,7 +410,7 @@ void sde_reg_bus_vote_client_destroy(struct reg_bus_client *client)
		if (!client) {
		SDEROT_ERR("reg bus vote: invalid client handle\n");
		} else {
		SDEROT_DBG("bus vote client %s destroyed:%p id:%u\n",
		SDEROT_DBG("bus vote client %s destroyed:%pK id:%u\n",
		client->name, client, client->id);
		mutex_lock(&sde_res->reg_bus_lock);
		list_del_init(&client->list);
		@@ -837,7 +837,7 @@ int sde_rotator_base_init(struct sde_rot_data_type **pmdata,
		SDEROT_ERR("unable to map SDE ROT VBIF base\n");
		goto probe_done;
		}
		SDEROT_DBG("SDE ROT VBIF HW Base addr=%p len=0x%x\n",
		SDEROT_DBG("SDE ROT VBIF HW Base addr=%pK len=0x%x\n",
		mdata->vbif_nrt_io.base, mdata->vbif_nrt_io.len);

		rc = sde_mdp_parse_dt_misc(pdev, mdata);

drivers/media/platform/msm/sde/rotator/sde_rotator_core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -496,7 +496,7 @@ static void sde_rotator_clear_fence(struct sde_rot_entry *entry)
		{
		if (entry->input_fence) {
		SDEROT_EVTLOG(entry->input_fence, 1111);
		SDEROT_DBG("sys_fence_put i:%p\n", entry->input_fence);
		SDEROT_DBG("sys_fence_put i:%pK\n", entry->input_fence);
		sde_rotator_put_sync_fence(entry->input_fence);
		entry->input_fence = NULL;
		}
		@@ -507,7 +507,7 @@ static void sde_rotator_clear_fence(struct sde_rot_entry *entry)
		sde_rotator_resync_timeline(entry->fenceq->timeline);

		SDEROT_EVTLOG(entry->output_fence, 2222);
		SDEROT_DBG("sys_fence_put o:%p\n", entry->output_fence);
		SDEROT_DBG("sys_fence_put o:%pK\n", entry->output_fence);
		sde_rotator_put_sync_fence(entry->output_fence);
		entry->output_fence = NULL;
		}

drivers/media/platform/msm/sde/rotator/sde_rotator_debug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,7 @@ void sde_rot_dump_reg(const char *dump_name, u32 reg_dump_flag,

		if (*dump_mem) {
		dump_addr = *dump_mem;
		pr_info("%s: start_addr:0x%p end_addr:0x%p reg_addr=0x%X\n",
		pr_info("%s: start_addr:0x%pK end_addr:0x%pK reg_addr=0x%X\n",
		dump_name, dump_addr, dump_addr + (u32)len * 16,
		addr);
		} else {

drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2356,7 +2356,7 @@ static int sde_rotator_qbuf(struct file file, void fh,
		ctx->vbinfo_cap[idx].qbuf_ts = ktime_get();
		ctx->vbinfo_cap[idx].dqbuf_ts = NULL;
		SDEDEV_DBG(ctx->rot_dev->dev,
		"create buffer fence s:%d.%u i:%d f:%p\n",
		"create buffer fence s:%d.%u i:%d f:%pK\n",
		ctx->session_id,
		ctx->vbinfo_cap[idx].fence_ts,
		idx,
		@@ -3045,7 +3045,7 @@ static void sde_rotator_retire_handler(struct kthread_work *work)

		if (!src_buf \|\| !dst_buf) {
		SDEDEV_ERR(rot_dev->dev,
		"null buffer in retire s:%d sb:%p db:%p\n",
		"null buffer in retire s:%d sb:%pK db:%pK\n",
		ctx->session_id,
		src_buf, dst_buf);
		}
		@@ -3334,7 +3334,7 @@ static void sde_rotator_device_run(void *priv)
		dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
		if (!src_buf \|\| !dst_buf) {
		SDEDEV_ERR(rot_dev->dev,
		"null buffer in device run s:%d sb:%p db:%p\n",
		"null buffer in device run s:%d sb:%pK db:%pK\n",
		ctx->session_id,
		src_buf, dst_buf);
		goto error_process_buffers;

drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c

+13 −12

Original line number	Diff line number	Diff line
		@@ -972,7 +972,7 @@ static struct sde_hw_rotator_context *sde_hw_rotator_get_ctx(
		if (ctx && (ctx->session_id == session_id) &&
		(ctx->sequence_id == sequence_id)) {
		SDEROT_DBG(
		"rotCtx sloti[%d][%d] ==> ctx:%p \| session-id:%d \| sequence-id:%d\n",
		"rotCtx sloti[%d][%d] ==> ctx:%pK \| session-id:%d \| sequence-id:%d\n",
		q_id, i, ctx, ctx->session_id,
		ctx->sequence_id);
		return ctx;
		@@ -1001,7 +1001,7 @@ static void sde_hw_rotator_map_vaddr(struct sde_dbg_buf *dbgbuf,
		if (dbgbuf->dmabuf && (dbgbuf->buflen > 0)) {
		dma_buf_begin_cpu_access(dbgbuf->dmabuf, DMA_FROM_DEVICE);
		dbgbuf->vaddr = dma_buf_kmap(dbgbuf->dmabuf, 0);
		SDEROT_DBG("vaddr mapping: 0x%p/%ld w:%d/h:%d\n",
		SDEROT_DBG("vaddr mapping: 0x%pK/%ld w:%d/h:%d\n",
		dbgbuf->vaddr, dbgbuf->buflen,
		dbgbuf->width, dbgbuf->height);
		}
		@@ -2046,7 +2046,7 @@ static u32 sde_hw_rotator_wait_done_regdma(
		unsigned long flags;

		if (rot->irq_num >= 0) {
		SDEROT_DBG("Wait for REGDMA completion, ctx:%p, ts:%X\n",
		SDEROT_DBG("Wait for REGDMA completion, ctx:%pK, ts:%X\n",
		ctx, ctx->timestamp);
		rc = wait_event_timeout(ctx->regdma_waitq,
		!rot->ops.get_pending_ts(rot, ctx, &swts),
		@@ -2230,7 +2230,7 @@ static int sde_hw_rotator_swts_create(struct sde_hw_rotator *rot)
		}

		data->mapped = true;
		SDEROT_DBG("swts buffer mapped: %pad/%lx va:%p\n", &data->addr,
		SDEROT_DBG("swts buffer mapped: %pad/%lx va:%pK\n", &data->addr,
		data->len, rot->swts_buffer);

		sde_smmu_ctrl(0);
		@@ -2450,7 +2450,7 @@ static struct sde_rot_hw_resource *sde_hw_rotator_alloc_ext(
		if (resinfo->rot->irq_num >= 0)
		sde_hw_rotator_enable_irq(resinfo->rot);

		SDEROT_DBG("New rotator resource:%p, priority:%d\n",
		SDEROT_DBG("New rotator resource:%pK, priority:%d\n",
		resinfo, wb_id);

		return &resinfo->hw;
		@@ -2472,7 +2472,7 @@ static void sde_hw_rotator_free_ext(struct sde_rot_mgr *mgr,
		resinfo = container_of(hw, struct sde_hw_rotator_resource_info, hw);

		SDEROT_DBG(
		"Free rotator resource:%p, priority:%d, active:%d, pending:%d\n",
		"Free rotator resource:%pK, priority:%d, active:%d, pending:%d\n",
		resinfo, hw->wb_id, atomic_read(&hw->num_active),
		hw->pending_count);

		@@ -2535,7 +2535,7 @@ static struct sde_hw_rotator_context *sde_hw_rotator_alloc_rotctx(
		sde_hw_rotator_put_ctx(ctx);

		SDEROT_DBG(
		"New rot CTX:%p, ctxidx:%d, session-id:%d, prio:%d, timestamp:%X, active:%d sbuf:%d\n",
		"New rot CTX:%pK, ctxidx:%d, session-id:%d, prio:%d, timestamp:%X, active:%d sbuf:%d\n",
		ctx, sde_hw_rotator_get_regdma_ctxidx(ctx), ctx->session_id,
		ctx->q_id, ctx->timestamp,
		atomic_read(&ctx->hwres->num_active),
		@@ -2556,7 +2556,7 @@ static void sde_hw_rotator_free_rotctx(struct sde_hw_rotator *rot,
		return;

		SDEROT_DBG(
		"Free rot CTX:%p, ctxidx:%d, session-id:%d, prio:%d, timestamp:%X, active:%d sbuf:%d\n",
		"Free rot CTX:%pK, ctxidx:%d, session-id:%d, prio:%d, timestamp:%X, active:%d sbuf:%d\n",
		ctx, sde_hw_rotator_get_regdma_ctxidx(ctx), ctx->session_id,
		ctx->q_id, ctx->timestamp,
		atomic_read(&ctx->hwres->num_active),
		@@ -3284,7 +3284,7 @@ static irqreturn_t sde_hw_rotator_regdmairq_handler(int irq, void *ptr)
		ctx->last_regdma_isr_status = isr;
		ctx->last_regdma_timestamp = ts;
		SDEROT_DBG(
		"regdma complete: ctx:%p, ts:%X\n", ctx, ts);
		"regdma complete: ctx:%pK, ts:%X\n", ctx, ts);
		wake_up_all(&ctx->regdma_waitq);

		ts = (ts - 1) & SDE_REGDMA_SWTS_MASK;
		@@ -3317,7 +3317,8 @@ static irqreturn_t sde_hw_rotator_regdmairq_handler(int irq, void *ptr)
		ctx->last_regdma_isr_status = isr;
		ctx->last_regdma_timestamp = ts;
		wake_up_all(&ctx->regdma_waitq);
		SDEROT_DBG("Wakeup rotctx[%d][%d]:%p\n",
		SDEROT_DBG(
		"Wakeup rotctx[%d][%d]:%pK\n",
		i, j, ctx);
		}
		}
		@@ -3541,7 +3542,7 @@ static ssize_t sde_hw_rotator_show_state(struct sde_rot_mgr *mgr,

		if (ctx) {
		SPRINT(
		"rotCtx[%d][%d]:%p\n",
		"rotCtx[%d][%d]:%pK\n",
		i, j, ctx);
		++num_active;
		}