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

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

Merge "msm: camera: isp: Add support for PLAIN128 format over RDI" into dev/msm-4.9-camx

parents 235de46d ea34b60c

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ static int cam_ife_csid_get_format_rdi( 
	case CAM_FORMAT_MIPI_RAW_8:

		switch (out_format) {

		case CAM_FORMAT_MIPI_RAW_8:

		case CAM_FORMAT_PLAIN128:

			*decode_fmt = 0xf;

			break;

		case CAM_FORMAT_PLAIN8:
@@ -99,6 +100,7 @@ static int cam_ife_csid_get_format_rdi( 
	case CAM_FORMAT_MIPI_RAW_10:

		switch (out_format) {

		case CAM_FORMAT_MIPI_RAW_10:

		case CAM_FORMAT_PLAIN128:

			*decode_fmt = 0xf;

			break;

		case CAM_FORMAT_PLAIN16_10:

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

+1 −4
Original line number Diff line number Diff line
@@ -815,6 +815,7 @@ static int cam_vfe_bus_acquire_wm( 
		case CAM_FORMAT_MIPI_RAW_14:

		case CAM_FORMAT_MIPI_RAW_16:

		case CAM_FORMAT_MIPI_RAW_20:

		case CAM_FORMAT_PLAIN128:

			rsrc_data->width = CAM_VFE_RDI_BUS_DEFAULT_WIDTH;

			rsrc_data->height = 0;

			rsrc_data->stride = CAM_VFE_RDI_BUS_DEFAULT_STRIDE;
@@ -859,10 +860,6 @@ static int cam_vfe_bus_acquire_wm( 
			rsrc_data->en_cfg = 0x1;

			rsrc_data->pack_fmt = 0xA;

			break;

		case CAM_FORMAT_PLAIN128:

			rsrc_data->en_cfg = 0x1;

			rsrc_data->pack_fmt = 0x0;

			break;

		default:

			CAM_ERR(CAM_ISP, "Unsupported RDI format %d",

				rsrc_data->format);