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

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

Merge "msm: camera: isp: Fix rdi port plain configuration" into dev/msm-4.9-camx

parents a4a42aa4 d6a3c8ce

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

+4 −22
Original line number Diff line number Diff line
@@ -863,34 +863,16 @@ static int cam_vfe_bus_acquire_wm( 
			rsrc_data->stride = rsrc_data->width;

			break;

		case CAM_FORMAT_PLAIN16_10:

		case CAM_FORMAT_PLAIN16_12:

		case CAM_FORMAT_PLAIN16_14:

		case CAM_FORMAT_PLAIN16_16:

		case CAM_FORMAT_PLAIN32_20:

			rsrc_data->width = CAM_VFE_RDI_BUS_DEFAULT_WIDTH;

			rsrc_data->height = 0;

			rsrc_data->stride = CAM_VFE_RDI_BUS_DEFAULT_STRIDE;

			rsrc_data->pack_fmt = 0x0;

			rsrc_data->en_cfg = 0x3;

			break;

		case CAM_FORMAT_PLAIN16_12:

			rsrc_data->en_cfg = 0x1;

			rsrc_data->pack_fmt = 0x3;

			rsrc_data->width = rsrc_data->width * 2;

			rsrc_data->stride = rsrc_data->width;

			break;

		case CAM_FORMAT_PLAIN16_14:

			rsrc_data->en_cfg = 0x1;

			rsrc_data->pack_fmt = 0x4;

			rsrc_data->width = rsrc_data->width * 2;

			rsrc_data->stride = rsrc_data->width;

			break;

		case CAM_FORMAT_PLAIN16_16:

			rsrc_data->en_cfg = 0x1;

			rsrc_data->pack_fmt = 0x5;

			rsrc_data->width = rsrc_data->width * 2;

			rsrc_data->stride = rsrc_data->width;

			break;

		case CAM_FORMAT_PLAIN32_20:

			rsrc_data->en_cfg = 0x1;

			rsrc_data->pack_fmt = 0x9;

			break;

		case CAM_FORMAT_PLAIN64:

			rsrc_data->en_cfg = 0x1;

			rsrc_data->pack_fmt = 0xA;