Merge "msm: camera2: cpp: Add compat ioctl support for IOMMU attach/detach" (ca7cc6ac) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -2341,11 +2341,18 @@ static long msm_cpp_subdev_fops_compat_ioctl(struct file *file,
		case VIDIOC_MSM_CPP_POP_STREAM_BUFFER32:
		cmd = VIDIOC_MSM_CPP_POP_STREAM_BUFFER;
		break;
		case VIDIOC_MSM_CPP_IOMMU_ATTACH32:
		cmd = VIDIOC_MSM_CPP_IOMMU_ATTACH;
		break;
		case VIDIOC_MSM_CPP_IOMMU_DETACH32:
		cmd = VIDIOC_MSM_CPP_IOMMU_DETACH;
		break;
		case MSM_SD_SHUTDOWN:
		cmd = MSM_SD_SHUTDOWN;
		break;
		default:
		pr_debug("%s: unsupported compat type :%d\n", __func__, cmd);
		pr_err_ratelimited("%s: unsupported compat type :%d\n",
		__func__, cmd);
		break;
		}

		@@ -2358,6 +2365,8 @@ static long msm_cpp_subdev_fops_compat_ioctl(struct file *file,
		case VIDIOC_MSM_CPP_SET_CLOCK:
		case VIDIOC_MSM_CPP_QUEUE_BUF:
		case VIDIOC_MSM_CPP_POP_STREAM_BUFFER:
		case VIDIOC_MSM_CPP_IOMMU_ATTACH:
		case VIDIOC_MSM_CPP_IOMMU_DETACH:
		case MSM_SD_SHUTDOWN:
		rc = v4l2_subdev_call(sd, core, ioctl, cmd, &kp_ioctl);
		break;
		@@ -2365,7 +2374,8 @@ static long msm_cpp_subdev_fops_compat_ioctl(struct file *file,
		case VIDIOC_MSM_CPP_GET_EVENTPAYLOAD:
		break;
		default:
		pr_debug("%s: unsupported compat type :%d\n", __func__, cmd);
		pr_err_ratelimited("%s: unsupported compat type :%d\n",
		__func__, cmd);
		break;
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -345,6 +345,12 @@ struct msm_pproc_queue_buf_info32_t {
		#define VIDIOC_MSM_CPP_POP_STREAM_BUFFER32 \
		_IOWR('V', BASE_VIDIOC_PRIVATE + 17, struct msm_camera_v4l2_ioctl32_t)

		#define VIDIOC_MSM_CPP_IOMMU_ATTACH32 \
		_IOWR('V', BASE_VIDIOC_PRIVATE + 18, struct msm_camera_v4l2_ioctl32_t)

		#define VIDIOC_MSM_CPP_IOMMU_DETACH32 \
		_IOWR('V', BASE_VIDIOC_PRIVATE + 19, struct msm_camera_v4l2_ioctl32_t)

		struct msm_camera_v4l2_ioctl32_t {
		uint32_t id;
		uint32_t len;