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

Commit e4c3277d authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: ope: Add support for stripe level height configuration"... 

Merge "msm: camera: ope: Add support for stripe level height configuration" into camera-kernel.lnx.3.1
parents e58258b6 59ba70d9

drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -1536,7 +1536,7 @@ static int cam_ope_mgr_process_cmd_io_buf_req(struct cam_ope_hw_mgr *hw_mgr, 
					stripe_info->width =

						in_stripe_info->width;

					stripe_info->height =

						in_io_buf->height[k];

						in_stripe_info->height;

					stripe_info->stride =

						in_io_buf->plane_stride[k];

					stripe_info->x_init =

include/uapi/media/cam_ope.h

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
 * @x_init:          X_init

 * @stripe_location: Stripe location (OPE_STRIPE_XXX)

 * @width:           Width of a stripe

 * @height:          Height of a stripe

 * @disable_bus:     Flag to disable BUS master

 * @reserved:        Reserved

 *
@@ -92,6 +93,7 @@ struct ope_stripe_info { 
	uint32_t x_init;

	uint32_t stripe_location;

	uint32_t width;

	uint32_t height;

	uint32_t disable_bus;

	uint32_t reserved;

};