Merge "msm: cpp: Remove informational prints from the driver" (8cbf0cff) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+18 −18

Original line number	Diff line number	Diff line
		@@ -279,7 +279,7 @@ static void msm_enqueue(struct msm_device_queue *queue,
		queue->len++;
		if (queue->len > queue->max) {
		queue->max = queue->len;
		pr_info("queue %s new max is %d\n", queue->name, queue->max);
		pr_debug("queue %s new max is %d\n", queue->name, queue->max);
		}
		list_add_tail(entry, &queue->list);
		wake_up(&queue->wait);
		@@ -624,7 +624,7 @@ static void msm_cpp_delete_buff_queue(struct cpp_device *cpp_dev)

		for (i = 0; i < cpp_dev->num_buffq; i++) {
		if (cpp_dev->buff_queue[i].used == 1) {
		pr_info("Queue not free sessionid: %d, streamid: %d\n",
		pr_warn("Queue not free sessionid: %d, streamid: %d\n",
		cpp_dev->buff_queue[i].session_id,
		cpp_dev->buff_queue[i].stream_id);
		msm_cpp_dequeue_buff_info_list
		@@ -1228,7 +1228,7 @@ static void cpp_release_hardware(struct cpp_device *cpp_dev)
		regulator_put(cpp_dev->fs_mmagic_camss);
		cpp_dev->fs_mmagic_camss = NULL;
		if (cpp_dev->stream_cnt > 0) {
		pr_info("stream count active\n");
		pr_warn("stream count active\n");
		rc = msm_cpp_update_bandwidth_setting(cpp_dev, 0, 0);
		}
		cpp_dev->stream_cnt = 0;
		@@ -1629,7 +1629,7 @@ static void msm_cpp_do_timeout_work(struct work_struct *work)
		struct msm_cpp_frame_info_t *processed_frame[MAX_CPP_PROCESSING_FRAME];
		struct cpp_device *cpp_dev = cpp_timer.data.cpp_dev;

		pr_info("cpp_timer_callback called. (jiffies=%lu)\n",
		pr_warn("cpp_timer_callback called. (jiffies=%lu)\n",
		jiffies);
		mutex_lock(&cpp_dev->mutex);

		@@ -1639,15 +1639,15 @@ static void msm_cpp_do_timeout_work(struct work_struct *work)
		goto end;
		}
		if (!atomic_read(&cpp_timer.used)) {
		pr_info("Delayed trigger, IRQ serviced\n");
		pr_warn("Delayed trigger, IRQ serviced\n");
		goto end;
		}

		disable_irq(cpp_timer.data.cpp_dev->irq->start);
		pr_info("Reloading firmware\n");
		pr_debug("Reloading firmware\n");
		cpp_load_fw(cpp_timer.data.cpp_dev,
		cpp_timer.data.cpp_dev->fw_name_bin);
		pr_info("Firmware loading done\n");
		pr_warn("Firmware loading done\n");
		enable_irq(cpp_timer.data.cpp_dev->irq->start);
		msm_camera_io_w_mb(0x8, cpp_timer.data.cpp_dev->base +
		MSM_CPP_MICRO_IRQGEN_MASK);
		@@ -1656,7 +1656,7 @@ static void msm_cpp_do_timeout_work(struct work_struct *work)
		MSM_CPP_MICRO_IRQGEN_CLR);

		if (!atomic_read(&cpp_timer.used)) {
		pr_info("Delayed trigger, IRQ serviced\n");
		pr_warn("Delayed trigger, IRQ serviced\n");
		goto end;
		}

		@@ -1665,7 +1665,7 @@ static void msm_cpp_do_timeout_work(struct work_struct *work)

		if (cpp_dev->timeout_trial_cnt >=
		cpp_dev->max_timeout_trial_cnt) {
		pr_info("Max trial reached\n");
		pr_warn("Max trial reached\n");
		while (queue_len) {
		msm_cpp_notify_frame_done(cpp_dev, 1);
		queue_len--;
		@@ -1678,7 +1678,7 @@ static void msm_cpp_do_timeout_work(struct work_struct *work)
		}

		atomic_set(&cpp_timer.used, 1);
		pr_info("Starting timer to fire in %d ms. (jiffies=%lu)\n",
		pr_debug("Starting timer to fire in %d ms. (jiffies=%lu)\n",
		CPP_CMD_TIMEOUT_MS, jiffies);
		mod_timer(&cpp_timer.cpp_timer,
		jiffies + msecs_to_jiffies(CPP_CMD_TIMEOUT_MS));
		@@ -1687,7 +1687,7 @@ static void msm_cpp_do_timeout_work(struct work_struct *work)
		processed_frame[i] = cpp_timer.data.processed_frame[i];

		for (i = 0; i < queue_len; i++) {
		pr_info("Rescheduling for identity=0x%x, frame_id=%03d\n",
		pr_warn("Rescheduling for identity=0x%x, frame_id=%03d\n",
		processed_frame[i]->identity,
		processed_frame[i]->frame_id);

		@@ -1714,7 +1714,7 @@ static void msm_cpp_do_timeout_work(struct work_struct *work)
		}
		/* send trailer */
		msm_cpp_write(0xabcdefaa, cpp_dev->base);
		pr_info("After frame:%d write\n", i+1);
		pr_debug("After frame:%d write\n", i+1);
		}

		cpp_timer.data.cpp_dev->timeout_trial_cnt++;
		@@ -1722,7 +1722,7 @@ static void msm_cpp_do_timeout_work(struct work_struct *work)
		end:
		mutex_unlock(&cpp_dev->mutex);

		pr_info("exit\n");
		pr_debug("exit\n");
		return;
		}

		@@ -2197,7 +2197,7 @@ static int msm_cpp_cfg_frame(struct cpp_device *cpp_dev,
		}

		if (cpp_dev->iommu_state != CPP_IOMMU_STATE_ATTACHED) {
		pr_info("IOMMU is not attached\n");
		pr_err("IOMMU is not attached\n");
		return -EAGAIN;
		}

		@@ -2427,7 +2427,7 @@ void msm_cpp_clean_queue(struct cpp_device *cpp_dev)
		struct msm_device_queue *queue = NULL;

		while (cpp_dev->processing_q.len) {
		pr_info("queue len:%d\n", cpp_dev->processing_q.len);
		pr_debug("queue len:%d\n", cpp_dev->processing_q.len);
		queue = &cpp_dev->processing_q;
		frame_qcmd = msm_dequeue(queue, list_frame);
		if (frame_qcmd) {
		@@ -2761,7 +2761,7 @@ STREAM_BUFF_END:
		buff_queue_info->stream_id);
		if (cpp_dev->stream_cnt > 0) {
		cpp_dev->stream_cnt--;
		pr_info("stream_cnt:%d\n", cpp_dev->stream_cnt);
		pr_debug("stream_cnt:%d\n", cpp_dev->stream_cnt);
		if (cpp_dev->stream_cnt == 0) {
		rc = msm_cpp_update_bandwidth_setting(cpp_dev,
		0, 0);
		@@ -2867,11 +2867,11 @@ STREAM_BUFF_END:
		case MSM_SD_SHUTDOWN:
		CPP_DBG("MSM_SD_SHUTDOWN\n");
		mutex_unlock(&cpp_dev->mutex);
		pr_info("shutdown cpp node. open cnt:%d\n",
		pr_warn("shutdown cpp node. open cnt:%d\n",
		cpp_dev->cpp_open_cnt);

		if (atomic_read(&cpp_timer.used))
		pr_info("Timer state not cleared\n");
		pr_debug("Timer state not cleared\n");

		while (cpp_dev->cpp_open_cnt != 0)
		cpp_close_node(sd, NULL);