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

msm: camera_v2: Reset CPP AXI at camera close

Browse source 
CPP AXI need to be reset during camera close
to overcome stale data.

Change-Id: I4af43bbf67a84eaa5fc2a722854117a5936ab896
Signed-off-by: Venu Raidu <vraidu@codeaurora.org>
Signed-off-by: Sumalatha Malothu <smalot@codeaurora.org>
Signed-off-by: Shadul Shaikh <sshadu@codeaurora.org>
This commit is contained in:
Venu Raidu 2019-02-22 11:56:55 +05:30 • committed by Shadul Shaikh
parent 1b2ea6cc74
commit d1644a2fe6
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
View file

@ -1499,6 +1499,8 @@ static int cpp_close_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
{
uint32_t i;
int rc = -1;
int counter = 0;
u32 result = 0;
struct cpp_device *cpp_dev = NULL;
struct msm_device_queue *processing_q = NULL;
struct msm_device_queue *eventData_q = NULL;
@ -1579,6 +1581,26 @@ static int cpp_close_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
msm_camera_io_r(cpp_dev->cpp_hw_base + 0x88));
pr_debug("DEBUG_R1: 0x%x\n",
msm_camera_io_r(cpp_dev->cpp_hw_base + 0x8C));
/* mask IRQ status */
msm_camera_io_w(0xB, cpp_dev->cpp_hw_base + 0xC);
while (counter < MSM_CPP_AXI_RESET_RETRIES) {
/* MMSS_A_CPP_AXI_CMD = 0x16C, reset 0x1*/
msm_camera_io_w(0x1, cpp_dev->cpp_hw_base + 0x16C);
usleep_range(100, 200);
result = msm_camera_io_r(cpp_dev->cpp_hw_base + 0x16C);
if (result & 0x1) {
pr_debug("CPP AXI reset successful result %d",
result);
break;
}
counter++;
}
if (!(result & 0x1))
pr_err("CPP AXI reset un-successful result %d",
result);
msm_camera_io_w(0x0, cpp_dev->base + MSM_CPP_MICRO_CLKEN_CTL);
msm_cpp_clear_timer(cpp_dev);
cpp_release_hardware(cpp_dev);

1
drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.h
View file

@ -92,6 +92,7 @@
#define MSM_CPP_START_ADDRESS 0x0
#define MSM_CPP_END_ADDRESS 0x3F00
#define MSM_CPP_AXI_RESET_RETRIES 5
#define MSM_CPP_POLL_RETRIES 200
#define MSM_CPP_TASKLETQ_SIZE 16
#define MSM_CPP_TX_FIFO_LEVEL 16