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

Merge "msm: camera_v2: Avoid halting AXI bridge"

Browse source
This commit is contained in:
Linux Build Service Account 2019-10-10 14:55:36 -07:00 • committed by Gerrit - the friendly Code Review server
commit f0cc9af172
1 changed files with 0 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1498,8 +1498,6 @@ static int cpp_close_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
{ {
uint32_t i; uint32_t i;
int rc = -1; int rc = -1;
int counter = 0;
u32 result = 0;
struct cpp_device *cpp_dev = NULL; struct cpp_device *cpp_dev = NULL;
struct msm_device_queue *processing_q = NULL; struct msm_device_queue *processing_q = NULL;
struct msm_device_queue *eventData_q = NULL; struct msm_device_queue *eventData_q = NULL;
@ -1581,54 +1579,6 @@ static int cpp_close_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
pr_debug("DEBUG_R1: 0x%x\n", pr_debug("DEBUG_R1: 0x%x\n",
msm_camera_io_r(cpp_dev->cpp_hw_base + 0x8C)); msm_camera_io_r(cpp_dev->cpp_hw_base + 0x8C));
/* mask IRQ status */
msm_camera_io_w(0xB, cpp_dev->cpp_hw_base + 0xC);
/* clear IRQ status */
msm_camera_io_w(0xFFFFF, cpp_dev->cpp_hw_base + 0x14);
/* MMSS_A_CPP_AXI_CMD = 0x16C, reset 0x1*/
msm_camera_io_w(0x1, cpp_dev->cpp_hw_base + 0x16C);
while (counter < MSM_CPP_POLL_RETRIES) {
result = msm_camera_io_r(cpp_dev->cpp_hw_base + 0x10);
if (result & 0x2)
break;
/*
* Below usleep values are chosen based on experiments
* and this was the smallest number which works. This
* sleep is needed to leave enough time for hardware
* to update status register.
*/
usleep_range(200, 250);
counter++;
}
pr_debug("CPP AXI done counter %d result 0x%x\n",
counter, result);
/* clear IRQ status */
msm_camera_io_w(0xFFFFF, cpp_dev->cpp_hw_base + 0x14);
counter = 0;
/* MMSS_A_CPP_RST_CMD_0 = 0x8, firmware reset = 0x3DF77 */
msm_camera_io_w(0x3DF77, cpp_dev->cpp_hw_base + 0x8);
while (counter < MSM_CPP_POLL_RETRIES) {
result = msm_camera_io_r(cpp_dev->cpp_hw_base + 0x10);
if (result & 0x1)
break;
/*
* Below usleep values are chosen based on experiments
* and this was the smallest number which works. This
* sleep is needed to leave enough time for hardware
* to update status register.
*/
usleep_range(200, 250);
counter++;
}
pr_debug("CPP reset done counter %d result 0x%x\n",
counter, result);
msm_camera_io_w(0x0, cpp_dev->base + MSM_CPP_MICRO_CLKEN_CTL); msm_camera_io_w(0x0, cpp_dev->base + MSM_CPP_MICRO_CLKEN_CTL);
msm_cpp_clear_timer(cpp_dev); msm_cpp_clear_timer(cpp_dev);
cpp_release_hardware(cpp_dev); cpp_release_hardware(cpp_dev);