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

Commit 064143a8 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Update packer format for NV21" into dev/msm-4.9-camx

parents ae7b663d f8a872df

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c

+5 −2
Original line number Diff line number Diff line
@@ -738,10 +738,12 @@ static int cam_vfe_bus_get_wm_idx( 
}



static enum cam_vfe_bus_packer_format

	cam_vfe_bus_get_packer_fmt(uint32_t out_fmt)

	cam_vfe_bus_get_packer_fmt(uint32_t out_fmt, int wm_index)

{

	switch (out_fmt) {

	case CAM_FORMAT_NV21:

		if (wm_index == 4 || wm_index == 6)

			return PACKER_FMT_PLAIN_8_LSB_MSB_10_ODD_EVEN;

	case CAM_FORMAT_NV12:

	case CAM_FORMAT_UBWC_NV12:

	case CAM_FORMAT_UBWC_NV12_4R:
@@ -817,7 +819,8 @@ static int cam_vfe_bus_acquire_wm( 
	rsrc_data->irq_enabled = subscribe_irq;

	rsrc_data->ctx = ctx;

	rsrc_data->format = out_port_info->format;

	rsrc_data->pack_fmt = cam_vfe_bus_get_packer_fmt(rsrc_data->format);

	rsrc_data->pack_fmt = cam_vfe_bus_get_packer_fmt(rsrc_data->format,

		wm_idx);



	rsrc_data->width = out_port_info->width;

	rsrc_data->height = out_port_info->height;