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

Commit 0bfc8ccc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: add support for ISP testgen config"

parents ddfecb0d 77ae46f6

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

+107 −0
Original line number Diff line number Diff line
@@ -898,6 +898,112 @@ static void msm_vfe46_cfg_fetch_engine(struct vfe_device *vfe_dev, 
	}

}



static void msm_vfe46_cfg_testgen(struct vfe_device *vfe_dev,

	struct msm_vfe_testgen_cfg *testgen_cfg)

{

	uint32_t temp;

	uint32_t bit_per_pixel = 0;

	uint32_t bpp_reg = 0;

	uint32_t bayer_pix_pattern_reg = 0;

	uint32_t unicolorbar_reg = 0;

	uint32_t unicolor_enb = 0;



	bit_per_pixel = msm_isp_get_bit_per_pixel(

		vfe_dev->axi_data.src_info[VFE_PIX_0].input_format);



	switch (bit_per_pixel) {

	case 8:

		bpp_reg = 0x0;

		break;

	case 10:

		bpp_reg = 0x1;

		break;

	case 12:

		bpp_reg = 0x10;

		break;

	case 14:

		bpp_reg = 0x11;

		break;

	default:

		pr_err("%s: invalid bpp %d\n", __func__, bit_per_pixel);

		break;

	}



	msm_camera_io_w(bpp_reg << 16 | testgen_cfg->burst_num_frame,

		vfe_dev->vfe_base + 0xAF8);



	msm_camera_io_w(((testgen_cfg->lines_per_frame - 1) << 16) |

		(testgen_cfg->pixels_per_line - 1), vfe_dev->vfe_base + 0xAFC);



	temp = msm_camera_io_r(vfe_dev->vfe_base + 0x50);

	temp |= (((testgen_cfg->h_blank) & 0x3FFF) << 8);

	temp |= (1 << 24);

	msm_camera_io_w(temp, vfe_dev->vfe_base + 0x50);



	msm_camera_io_w((1 << 16) | testgen_cfg->v_blank,

		vfe_dev->vfe_base + 0xB0C);



	switch (testgen_cfg->pixel_bayer_pattern) {

	case ISP_BAYER_RGRGRG:

		bayer_pix_pattern_reg = 0x0;

		break;

	case ISP_BAYER_GRGRGR:

		bayer_pix_pattern_reg = 0x1;

		break;

	case ISP_BAYER_BGBGBG:

		bayer_pix_pattern_reg = 0x10;

		break;

	case ISP_BAYER_GBGBGB:

		bayer_pix_pattern_reg = 0x11;

		break;

	default:

		pr_err("%s: invalid pix pattern %d\n",

			__func__, bit_per_pixel);

		break;

	}



	if (testgen_cfg->color_bar_pattern == COLOR_BAR_8_COLOR) {

		unicolor_enb = 0x0;

	} else {

		unicolor_enb = 0x1;

		switch (testgen_cfg->color_bar_pattern) {

		case UNICOLOR_WHITE:

			unicolorbar_reg = 0x0;

			break;

		case UNICOLOR_YELLOW:

			unicolorbar_reg = 0x1;

			break;

		case UNICOLOR_CYAN:

			unicolorbar_reg = 0x10;

			break;

		case UNICOLOR_GREEN:

			unicolorbar_reg = 0x11;

			break;

		case UNICOLOR_MAGENTA:

			unicolorbar_reg = 0x100;

			break;

		case UNICOLOR_RED:

			unicolorbar_reg = 0x101;

			break;

		case UNICOLOR_BLUE:

			unicolorbar_reg = 0x110;

			break;

		case UNICOLOR_BLACK:

			unicolorbar_reg = 0x111;

			break;

		default:

			pr_err("%s: invalid colorbar %d\n",

				__func__, testgen_cfg->color_bar_pattern);

			break;

		}

	}



	msm_camera_io_w((testgen_cfg->rotate_period << 8) |

		(bayer_pix_pattern_reg << 6) | (unicolor_enb << 4) |

		(unicolorbar_reg), vfe_dev->vfe_base + 0xB14);

	return;

}



static void msm_vfe46_cfg_camif(struct vfe_device *vfe_dev,

	struct msm_vfe_pix_cfg *pix_cfg)

{
@@ -954,6 +1060,7 @@ static void msm_vfe46_cfg_input_mux(struct vfe_device *vfe_dev, 
		core_cfg |= 0x1 << 5;

		msm_camera_io_w_mb(core_cfg, vfe_dev->vfe_base + 0x50);

		msm_vfe46_cfg_camif(vfe_dev, pix_cfg);

		msm_vfe46_cfg_testgen(vfe_dev, &pix_cfg->testgen_cfg);

		break;

	case EXTERNAL_READ:

		core_cfg |= 0x2 << 5;

include/media/msmb_isp.h

+25 −0
Original line number Diff line number Diff line
@@ -87,6 +87,19 @@ enum msm_vfe_frame_skip_pattern { 
	MAX_SKIP,

};



enum msm_vfe_testgen_color_pattern {

	COLOR_BAR_8_COLOR,

	UNICOLOR_WHITE,

	UNICOLOR_YELLOW,

	UNICOLOR_CYAN,

	UNICOLOR_GREEN,

	UNICOLOR_MAGENTA,

	UNICOLOR_RED,

	UNICOLOR_BLUE,

	UNICOLOR_BLACK,

	MAX_COLOR,

};



enum msm_vfe_camif_input {

	CAMIF_DISABLED,

	CAMIF_PAD_REG_INPUT,
@@ -117,6 +130,17 @@ struct msm_vfe_camif_cfg { 
	enum msm_vfe_camif_input camif_input;

};



struct msm_vfe_testgen_cfg {

	uint32_t lines_per_frame;

	uint32_t pixels_per_line;

	uint32_t v_blank;

	uint32_t h_blank;

	enum ISP_START_PIXEL_PATTERN pixel_bayer_pattern;

	uint32_t rotate_period;

	enum msm_vfe_testgen_color_pattern color_bar_pattern;

	uint32_t burst_num_frame;

};



enum msm_vfe_inputmux {

	CAMIF,

	TESTGEN,
@@ -132,6 +156,7 @@ enum msm_vfe_stats_composite_group { 


struct msm_vfe_pix_cfg {

	struct msm_vfe_camif_cfg camif_cfg;

	struct msm_vfe_testgen_cfg testgen_cfg;

	struct msm_vfe_fetch_engine_cfg fetch_engine_cfg;

	enum msm_vfe_inputmux input_mux;

	enum ISP_START_PIXEL_PATTERN pixel_pattern;