evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: camera: isp: configure correct pixel per line with Testgen"

Browse source
This commit is contained in:
Linux Build Service Account 2017-06-14 09:57:02 -07:00 • committed by Gerrit - the friendly Code Review server
commit abc9a0c87d
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
View file

@ -1360,6 +1360,7 @@ void msm_vfe47_cfg_camif(struct vfe_device *vfe_dev,
{ {
uint16_t first_pixel, last_pixel, first_line, last_line; uint16_t first_pixel, last_pixel, first_line, last_line;
struct msm_vfe_camif_cfg *camif_cfg = &pix_cfg->camif_cfg; struct msm_vfe_camif_cfg *camif_cfg = &pix_cfg->camif_cfg;
struct msm_vfe_testgen_cfg *testgen_cfg = &pix_cfg->testgen_cfg;
uint32_t val, subsample_period, subsample_pattern; uint32_t val, subsample_period, subsample_pattern;
uint32_t irq_sub_period = 32; uint32_t irq_sub_period = 32;
uint32_t frame_sub_period = 32; uint32_t frame_sub_period = 32;
@ -1383,8 +1384,15 @@ void msm_vfe47_cfg_camif(struct vfe_device *vfe_dev,
subsample_period = camif_cfg->subsample_cfg.irq_subsample_period; subsample_period = camif_cfg->subsample_cfg.irq_subsample_period;
subsample_pattern = camif_cfg->subsample_cfg.irq_subsample_pattern; subsample_pattern = camif_cfg->subsample_cfg.irq_subsample_pattern;
msm_camera_io_w((camif_cfg->lines_per_frame - 1) << 16 | if (pix_cfg->input_mux == TESTGEN)
(camif_cfg->pixels_per_line - 1), vfe_dev->vfe_base + 0x484); msm_camera_io_w((testgen_cfg->lines_per_frame - 1) << 16 |
(testgen_cfg->pixels_per_line - 1),
vfe_dev->vfe_base + 0x484);
else
msm_camera_io_w((camif_cfg->lines_per_frame - 1) << 16 |
(camif_cfg->pixels_per_line - 1),
vfe_dev->vfe_base + 0x484);
if (bus_sub_en) { if (bus_sub_en) {
val = msm_camera_io_r(vfe_dev->vfe_base + 0x47C); val = msm_camera_io_r(vfe_dev->vfe_base + 0x47C);
val &= 0xFFFFFFDF; val &= 0xFFFFFFDF;

8
drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
View file

@ -479,8 +479,12 @@ static int msm_isp_cfg_pix(struct vfe_device *vfe_dev,
if (input_cfg->d.pix_cfg.input_mux == CAMIF || if (input_cfg->d.pix_cfg.input_mux == CAMIF ||
input_cfg->d.pix_cfg.input_mux == TESTGEN) { input_cfg->d.pix_cfg.input_mux == TESTGEN) {
vfe_dev->axi_data.src_info[VFE_PIX_0].width = if (input_cfg->d.pix_cfg.input_mux == CAMIF)
input_cfg->d.pix_cfg.camif_cfg.pixels_per_line; vfe_dev->axi_data.src_info[VFE_PIX_0].width =
input_cfg->d.pix_cfg.camif_cfg.pixels_per_line;
if (input_cfg->d.pix_cfg.input_mux == TESTGEN)
vfe_dev->axi_data.src_info[VFE_PIX_0].width =
input_cfg->d.pix_cfg.testgen_cfg.pixels_per_line;
if (input_cfg->d.pix_cfg.camif_cfg.subsample_cfg. if (input_cfg->d.pix_cfg.camif_cfg.subsample_cfg.
sof_counter_step > 0) { sof_counter_step > 0) {
vfe_dev->axi_data.src_info[VFE_PIX_0]. vfe_dev->axi_data.src_info[VFE_PIX_0].