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

Commit 10adb46d authored by Abhishek Kondaveeti's avatar Abhishek Kondaveeti Committed by Gerrit - the friendly Code Review server
Browse files

msm: isp: Add pdaf crop support for vfe40 driver 



1. Change UB size to 48KB
2. Add pdaf crop support

Change-Id: I522dfa59f668ed41b0ea7544aa70f529a6664be2
Signed-off-by: default avatarAbhishek Kondaveeti <akondave@codeaurora.org>
parent 0d88d69d

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#define VFE40_8939_VERSION 0x10040000

#define VFE40_8952_VERSION 0x10060000

#define VFE40_8976_VERSION 0x10050000

#define VFE40_8937_VERSION 0x10080000

#define VFE40_8953_VERSION 0x10090000

#define VFE32_8909_VERSION 0x30600



#define MAX_IOMMU_CTX 2
@@ -709,6 +711,7 @@ struct vfe_device { 
	uint32_t isp_raw0_debug;

	uint32_t isp_raw1_debug;

	uint32_t isp_raw2_debug;

	uint8_t is_camif_raw_crop_supported;

};



struct vfe_parent_device {

drivers/media/platform/msm/camera_v2/isp/msm_isp40.c

+35 −2
Original line number Diff line number Diff line
@@ -400,6 +400,10 @@ static void msm_vfe40_init_hardware_reg(struct vfe_device *vfe_dev) 
		vbif_parms.regs = "vbif-v2-regs";

		vbif_parms.settings = "vbif-v2-settings";

		break;

	case VFE40_8937_VERSION:

	case VFE40_8953_VERSION:

		vfe_dev->is_camif_raw_crop_supported = 1;

		break;

	default:

		pr_err("%s: QOS and VBIF is NOT configured for HW Version %x\n",

			__func__, vfe_dev->vfe_hw_version);
@@ -1376,6 +1380,31 @@ static void msm_vfe40_cfg_camif(struct vfe_device *vfe_dev, 
		msm_camera_io_w((subsample_cfg->line_skip << 16) |

			subsample_cfg->pixel_skip,

			vfe_dev->vfe_base + 0x30C);

			if (vfe_dev->is_camif_raw_crop_supported) {

				/* Pdaf output will be sent in PLAIN16 format*/

				val = msm_camera_io_r(vfe_dev->vfe_base + 0x54);

				val |= 5 << 9;

				msm_camera_io_w(val, vfe_dev->vfe_base + 0x54);

				if (subsample_cfg->first_pixel ||

					subsample_cfg->last_pixel ||

					subsample_cfg->first_line ||

					subsample_cfg->last_line) {

					msm_camera_io_w(

					subsample_cfg->first_pixel << 16 |

						subsample_cfg->last_pixel,

						vfe_dev->vfe_base + 0x8A4);

					msm_camera_io_w(

					subsample_cfg->first_line << 16 |

						subsample_cfg->last_line,

						vfe_dev->vfe_base + 0x8A8);

					val = msm_camera_io_r(

						vfe_dev->vfe_base + 0x2F8);

					val |= 1 << 22;

					msm_camera_io_w(val,

						vfe_dev->vfe_base + 0x2F8);

				}

			}



	}

}
@@ -1503,7 +1532,9 @@ static void msm_vfe40_axi_cfg_wm_reg( 
	} else if (vfe_dev->vfe_hw_version == VFE40_8952_VERSION) {

		burst_len = VFE40_BURST_LEN_8952_VERSION;

		wm_bit_shift = VFE40_WM_BIT_SHIFT;

	} else if (vfe_dev->vfe_hw_version == VFE40_8976_VERSION) {

	} else if (vfe_dev->vfe_hw_version == VFE40_8976_VERSION ||

		vfe_dev->vfe_hw_version == VFE40_8937_VERSION ||

		vfe_dev->vfe_hw_version == VFE40_8953_VERSION) {

		burst_len = VFE40_BURST_LEN_8952_VERSION;

		wm_bit_shift = VFE40_WM_BIT_SHIFT_8976_VERSION;

	} else {
@@ -2011,7 +2042,9 @@ static void msm_vfe40_stats_cfg_ub(struct vfe_device *vfe_dev) 
	};



	if (vfe_dev->vfe_hw_version == VFE40_8916_VERSION ||

	    vfe_dev->vfe_hw_version == VFE40_8939_VERSION) {

		vfe_dev->vfe_hw_version == VFE40_8939_VERSION ||

		vfe_dev->vfe_hw_version == VFE40_8937_VERSION ||

		vfe_dev->vfe_hw_version == VFE40_8953_VERSION) {

		stats_burst_len = VFE40_STATS_BURST_LEN_8916_VERSION;

		ub_offset = VFE40_UB_SIZE_8916;

	} else if (vfe_dev->vfe_hw_version == VFE40_8952_VERSION ||

include/media/msmb_isp.h

+4 −0
Original line number Diff line number Diff line
@@ -171,6 +171,10 @@ struct msm_vfe_camif_subsample_cfg { 
	uint32_t sof_counter_step;

	uint32_t pixel_skip;

	uint32_t line_skip;

	uint32_t first_line;

	uint32_t last_line;

	uint32_t first_pixel;

	uint32_t last_pixel;

};



/*