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

Commit 7239d034 authored by Harsh Shah's avatar Harsh Shah Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Add stride info as part of pf dump" into dev/msm-4.14-camx

parents adc794c4 cce98cbb

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

+3 −1
Original line number Diff line number Diff line
@@ -3847,9 +3847,11 @@ static void cam_icp_mgr_print_io_bufs(struct cam_packet *packet, 
			}



			CAM_INFO(CAM_ICP,

				"pln %d w %d h %d size %d addr 0x%x offset 0x%x memh %x",

				"pln %d w %d h %d s %u sh %u size %d addr 0x%x offset 0x%x memh %x",

				j, io_cfg[i].planes[j].width,

				io_cfg[i].planes[j].height,

				io_cfg[i].planes[j].plane_stride,

				io_cfg[i].planes[j].slice_height,

				(int32_t)src_buf_size,

				(unsigned int)iova_addr,

				io_cfg[i].offsets[j],

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

+2 −1
Original line number Diff line number Diff line
@@ -3387,9 +3387,10 @@ static void cam_ife_mgr_print_io_bufs(struct cam_packet *packet, 
			}



			CAM_INFO(CAM_ISP,

				"pln %d w %d h %d s 0x%x addr 0x%x end_addr 0x%x offset %x memh %x",

				"pln %d w %d h %d s %u size 0x%x addr 0x%x end_addr 0x%x offset %x memh %x",

				j, io_cfg[i].planes[j].width,

				io_cfg[i].planes[j].height,

				io_cfg[i].planes[j].plane_stride,

				(unsigned int)src_buf_size,

				(unsigned int)iova_addr,

				(unsigned int)iova_addr +