Merge "cam :msm: Add debug logs in cam sync module" into dev/msm-4.9-camx (269ff10f) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_sync/cam_sync.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ int cam_sync_create(int32_t sync_obj, const char name)
		idx = find_first_zero_bit(sync_dev->bitmap, CAM_SYNC_MAX_OBJS);
		if (idx >= CAM_SYNC_MAX_OBJS)
		return -ENOMEM;
		CAM_DBG(CAM_SYNC, "Index location available at idx: %ld", idx);
		bit = test_and_set_bit(idx, sync_dev->bitmap);
		} while (bit);

		@@ -97,6 +98,8 @@ int cam_sync_register_callback(sync_callback cb_func,
		INIT_WORK(&sync_cb->cb_dispatch_work,
		cam_sync_util_cb_dispatch);
		sync_cb->status = row->state;
		CAM_DBG(CAM_SYNC, "Callback trigger for sync object:%d",
		sync_cb->sync_obj);
		queue_work(sync_dev->work_queue,
		&sync_cb->cb_dispatch_work);

		@@ -134,6 +137,8 @@ int cam_sync_deregister_callback(sync_callback cb_func,
		return -EINVAL;
		}

		CAM_DBG(CAM_SYNC, "deregistered callback for sync object:%d",
		sync_obj);
		list_for_each_entry_safe(sync_cb, temp, &row->callback_list, list) {
		if (sync_cb->callback_func == cb_func &&
		sync_cb->cb_data == userdata) {
		@@ -202,6 +207,9 @@ int cam_sync_signal(int32_t sync_obj, uint32_t status)
		rc = cam_sync_util_add_to_signalable_list(sync_obj, status, &sync_list);
		if (rc < 0) {
		spin_unlock_bh(&sync_dev->row_spinlocks[sync_obj]);
		CAM_ERR(CAM_SYNC,
		"Error: Unable to add sync object :%d to signalable list",
		sync_obj);
		return rc;
		}

		@@ -261,6 +269,7 @@ int cam_sync_signal(int32_t sync_obj, uint32_t status)
		}

		/* Dispatch kernel callbacks if any were registered earlier */

		list_for_each_entry_safe(sync_cb,
		temp_sync_cb, &signalable_row->callback_list, list) {
		sync_cb->status = list_info->status;
		@@ -347,7 +356,7 @@ int cam_sync_merge(int32_t sync_obj, uint32_t num_objs, int32_t merged_obj)
		spin_unlock_bh(&sync_dev->row_spinlocks[idx]);
		return -EINVAL;
		}

		CAM_DBG(CAM_SYNC, "Init row at idx:%ld to merge objects", idx);
		*merged_obj = idx;
		spin_unlock_bh(&sync_dev->row_spinlocks[idx]);

drivers/media/platform/msm/camera/cam_sync/cam_sync_util.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,8 @@ int cam_sync_init_object(struct sync_table_row *table,
		init_completion(&row->signaled);
		INIT_LIST_HEAD(&row->callback_list);
		INIT_LIST_HEAD(&row->user_payload_list);
		CAM_DBG(CAM_SYNC, "Sync object Initialised: sync_id:%u row_state:%u ",
		row->sync_id, row->state);

		return 0;
		}
		@@ -312,6 +314,7 @@ int cam_sync_deinit_object(struct sync_table_row *table, uint32_t idx)
		INIT_LIST_HEAD(&row->user_payload_list);
		spin_unlock_bh(&sync_dev->row_spinlocks[idx]);

		CAM_DBG(CAM_SYNC, "Destroying sync obj:%d successful", idx);
		return 0;
		}

		@@ -349,6 +352,8 @@ void cam_sync_util_send_v4l2_event(uint32_t id,
		memcpy(payload_data, payload, len);

		v4l2_event_queue(sync_dev->vdev, &event);
		CAM_DBG(CAM_SYNC, "send v4l2 event for sync_obj :%d",
		sync_obj);
		}

		int cam_sync_util_validate_merge(uint32_t *sync_obj, uint32_t num_objs)
		@@ -391,6 +396,8 @@ int cam_sync_util_add_to_signalable_list(int32_t sync_obj,
		signalable_info->status = status;

		list_add_tail(&signalable_info->list, sync_list);
		CAM_DBG(CAM_SYNC, "Add sync_obj :%d with status :%d to signalable list",
		sync_obj, status);

		return 0;
		}