Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9f0dd4e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14 11/15"

parents f82deb74 8479b5ed

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.c

+5 −4
Original line number Diff line number Diff line
@@ -540,7 +540,6 @@ static int cam_fd_hw_util_processcmd_hw_dump(struct cam_hw_info *fd_hw, 
		mutex_unlock(&fd_hw->hw_mutex);

		return 0;

	}

	mutex_unlock(&fd_hw->hw_mutex);



	dump_args = (struct cam_fd_hw_dump_args *)args;

	soc_info = &fd_hw->soc_info;
@@ -551,6 +550,7 @@ static int cam_fd_hw_util_processcmd_hw_dump(struct cam_hw_info *fd_hw, 
	if (remain_len < min_len) {

		CAM_ERR(CAM_FD, "dump buffer exhaust %d %d",

			remain_len, min_len);

		mutex_unlock(&fd_hw->hw_mutex);

		return 0;

	}

	dst = (char *)dump_args->cpu_addr + dump_args->offset;
@@ -561,14 +561,15 @@ static int cam_fd_hw_util_processcmd_hw_dump(struct cam_hw_info *fd_hw, 
	addr = (uint32_t *)(dst + sizeof(struct cam_fd_hw_dump_header));

	start = addr;

	*addr++ = soc_info->index;

	num_reg = soc_info->reg_map[0].size/4;

	for (j = 0; j < soc_info->num_reg_map; j++) {

		num_reg = soc_info->reg_map[j].size/4;

		for (i = 0; i < num_reg; i++) {

			*addr++ = soc_info->mem_block[0]->start + i*4;

			*addr++ = cam_io_r(soc_info->reg_map[i].mem_base +

			*addr++ = soc_info->mem_block[j]->start + i*4;

			*addr++ = cam_io_r(soc_info->reg_map[j].mem_base +

				(i*4));

		}

	}

	mutex_unlock(&fd_hw->hw_mutex);

	hdr->size = hdr->word_size * (addr - start);

	dump_args->offset += hdr->size +

		sizeof(struct cam_fd_hw_dump_header);

drivers/media/platform/msm/camera/cam_lrme/lrme_hw_mgr/lrme_hw/cam_lrme_hw_core.c

+4 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ static int cam_lrme_hw_dump(struct cam_hw_info *lrme_hw, 
		mutex_unlock(&lrme_hw->hw_mutex);

		return 0;

	}

	mutex_unlock(&lrme_hw->hw_mutex);

	if (lrme_core->req_submit &&

		lrme_core->req_submit->req_id == dump_args->request_id)

		req = lrme_core->req_submit;
@@ -100,6 +99,7 @@ static int cam_lrme_hw_dump(struct cam_hw_info *lrme_hw, 
	if (!req) {

		CAM_DBG(CAM_LRME, "LRME req %lld not with hw",

			dump_args->request_id);

		mutex_unlock(&lrme_hw->hw_mutex);

		return 0;

	}

	cam_common_util_get_curr_timestamp(&cur_time);
@@ -112,6 +112,7 @@ static int cam_lrme_hw_dump(struct cam_hw_info *lrme_hw, 
			req->submit_timestamp.tv_usec,

			cur_time.tv_sec,

			cur_time.tv_usec);

		mutex_unlock(&lrme_hw->hw_mutex);

		return 0;

	}

	CAM_INFO(CAM_LRME, "Error req %lld %ld:%06ld %ld:%06ld",
@@ -126,6 +127,7 @@ static int cam_lrme_hw_dump(struct cam_hw_info *lrme_hw, 
	if (remain_len < min_len) {

		CAM_ERR(CAM_LRME, "dump buffer exhaust %d %d",

			remain_len, min_len);

		mutex_unlock(&lrme_hw->hw_mutex);

		return 0;

	}

	dst = (char *)dump_args->cpu_addr + dump_args->offset;
@@ -144,6 +146,7 @@ static int cam_lrme_hw_dump(struct cam_hw_info *lrme_hw, 
	dump_args->offset += hdr->size +

		sizeof(struct cam_lrme_hw_dump_header);

	cam_lrme_dump_regs_to_buf(req, lrme_hw, dump_args);

	mutex_unlock(&lrme_hw->hw_mutex);

	return 0;

}