Merge "msm: camera: isp: Added reg update after stats wm disable" (665500fb) · Commits · e / devices / android_kernel_sony_msm8994

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -1324,7 +1324,6 @@ static int msm_isp_buf_mgr_debug(struct msm_isp_buf_mgr *buf_mgr)
		}
		pr_err("%s\n", print_buf);
		kfree(print_buf);
		buf_mgr->pagefault_debug = 1;
		return rc;
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -2276,8 +2276,5 @@ void msm_isp_axi_disable_all_wm(struct vfe_device *vfe_dev)
		for (j = 0; j < stream_info->num_planes; j++)
		vfe_dev->hw_info->vfe_ops.axi_ops.enable_wm(vfe_dev,
		stream_info->wm[j], 0);

		vfe_dev->hw_info->vfe_ops.core_ops.reg_update(vfe_dev,
		SRC_TO_INTF(stream_info->stream_src));
		}
		}

+12 −2

Original line number	Diff line number	Diff line
		@@ -1838,25 +1838,35 @@ static int msm_vfe_iommu_fault_handler(struct iommu_domain *domain,
		struct device dev, unsigned long iova, int flags, void token)
		{
		struct vfe_device *vfe_dev = NULL;
		int rc = -ENOSYS;

		if (token) {
		vfe_dev = (struct vfe_device *)token;
		msm_isp_axi_disable_all_wm(vfe_dev);
		msm_isp_stats_disable(vfe_dev);
		/* VFE_SRC_MAX will call reg update on all stream src */
		vfe_dev->hw_info->vfe_ops.core_ops.reg_update(vfe_dev,
		VFE_SRC_MAX);
		if (!vfe_dev->buf_mgr \|\| !vfe_dev->buf_mgr->ops) {
		pr_err("%s:%d] buf_mgr %p\n", __func__,
		__LINE__, vfe_dev->buf_mgr);
		goto end;
		}
		if (!vfe_dev->buf_mgr->pagefault_debug)
		if (!vfe_dev->buf_mgr->pagefault_debug) {
		vfe_dev->buf_mgr->pagefault_debug = 1;
		msm_isp_enqueue_tasklet_cmd(vfe_dev, 0, 0, 1);
		} else {
		/* Page fault previously handled, avoid flooding logs*/
		rc = 0;
		goto end;
		}
		} else {
		ISP_DBG("%s:%d] no token received: %p\n",
		__func__, __LINE__, token);
		goto end;
		}
		end:
		return -ENOSYS;
		return rc;
		}

		int msm_isp_open_node(struct v4l2_subdev sd, struct v4l2_subdev_fh fh)