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

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

Merge "msm: camera: isp: update packer formats" into dev/msm-4.9-camx

parents bdca4e8b 5286dbab

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

+13 −7
Original line number Diff line number Diff line
@@ -656,8 +656,20 @@ static enum cam_vfe_bus_packer_format 
	case CAM_FORMAT_UBWC_NV12:

	case CAM_FORMAT_UBWC_NV12_4R:

		return PACKER_FMT_PLAIN_8_LSB_MSB_10;

	case CAM_FORMAT_PLAIN16_16:

		return PACKER_FMT_PLAIN_16_16BPP;

	case CAM_FORMAT_PLAIN64:

		return PACKER_FMT_PLAIN_64;

	case CAM_FORMAT_PLAIN8:

		return PACKER_FMT_PLAIN_8;

	case CAM_FORMAT_PLAIN16_10:

		return PACKER_FMT_PLAIN_16_10BPP;

	case CAM_FORMAT_PLAIN16_12:

		return PACKER_FMT_PLAIN_16_12BPP;

	case CAM_FORMAT_PLAIN16_14:

		return PACKER_FMT_PLAIN_16_14BPP;

	case CAM_FORMAT_PLAIN32_20:

		return PACKER_FMT_PLAIN_32_20BPP;

	case CAM_FORMAT_MIPI_RAW_6:

	case CAM_FORMAT_MIPI_RAW_8:

	case CAM_FORMAT_MIPI_RAW_10:
@@ -665,14 +677,8 @@ static enum cam_vfe_bus_packer_format 
	case CAM_FORMAT_MIPI_RAW_14:

	case CAM_FORMAT_MIPI_RAW_16:

	case CAM_FORMAT_MIPI_RAW_20:

	case CAM_FORMAT_PLAIN128:

	case CAM_FORMAT_PLAIN8:

	case CAM_FORMAT_PLAIN16_8:

	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:

	case CAM_FORMAT_PLAIN128:

	case CAM_FORMAT_PD8:

	case CAM_FORMAT_PD10:

		return PACKER_FMT_PLAIN_128;