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

Commit b815663b authored by Suresh Vankadara's avatar Suresh Vankadara Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Print mem handle index and io config index" into dev/msm-4.14-camx

parents 59f5a96c 71c8a680

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+6 −1
Original line number Diff line number Diff line
@@ -4081,8 +4081,13 @@ static void cam_icp_mgr_print_io_bufs(struct cam_packet *packet, 


	for (i = 0; i < packet->num_io_configs; i++) {

		for (j = 0; j < CAM_PACKET_MAX_PLANES; j++) {

			if (!io_cfg[i].mem_handle[j])

			if (!io_cfg[i].mem_handle[j]) {

				CAM_ERR(CAM_ICP,

					"Mem Handle %d is NULL for %d io config",

					j, i);

				break;

			}





			if (GET_FD_FROM_HANDLE(io_cfg[i].mem_handle[j]) ==

				GET_FD_FROM_HANDLE(pf_buf_info)) {

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+5 −1
Original line number Diff line number Diff line
@@ -4097,8 +4097,12 @@ static void cam_ife_mgr_print_io_bufs(struct cam_packet *packet, 


	for (i = 0; i < packet->num_io_configs; i++) {

		for (j = 0; j < CAM_PACKET_MAX_PLANES; j++) {

			if (!io_cfg[i].mem_handle[j])

			if (!io_cfg[i].mem_handle[j]) {

				CAM_ERR(CAM_ISP,

					"Mem Handle %d is NULL for %d io config",

					j, i);

				break;

			}



			if (pf_buf_info &&

				GET_FD_FROM_HANDLE(io_cfg[i].mem_handle[j]) ==

drivers/media/platform/msm/camera/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c

+6 −1
Original line number Diff line number Diff line
@@ -647,8 +647,13 @@ static void cam_jpeg_mgr_print_io_bufs(struct cam_packet *packet, 


	for (i = 0; i < packet->num_io_configs; i++) {

		for (j = 0; j < CAM_PACKET_MAX_PLANES; j++) {

			if (!io_cfg[i].mem_handle[j])

			if (!io_cfg[i].mem_handle[j]) {

				CAM_ERR(CAM_JPEG,

					"Mem Handle %d is NULL for %d io config",

					j, i);

				break;

			}





			if (GET_FD_FROM_HANDLE(io_cfg[i].mem_handle[j]) ==

				GET_FD_FROM_HANDLE(pf_buf_info)) {