asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: camera: Enable CPP and JPEG module

Browse source 
1. Add support for new attributes.
2. remove the redundant internal interface.

Change-Id: Ia7fc44fa3515d9462dec3e7f6ead782936e17aa9
Signed-off-by: Gurram Pravalika <gpravali@codeaurora.org>
This commit is contained in:
Gurram Pravalika 2020-07-01 22:47:21 +05:30 committed by Gerrit - the friendly Code Review server
parent 4085d5bf93
commit b2932c3048
4 changed files with 179 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/media/platform/msm/camera_v2/Makefile
View file

@ -16,10 +16,10 @@ obj-$(CONFIG_MSMB_CAMERA) += msm.o
obj-$(CONFIG_MSMB_CAMERA) += camera/
obj-$(CONFIG_MSMB_CAMERA) += msm_vb2/
obj-$(CONFIG_MSMB_CAMERA) += sensor/
#obj-$(CONFIG_MSMB_CAMERA) += pproc/
obj-$(CONFIG_MSMB_CAMERA) += pproc/
obj-$(CONFIG_MSMB_CAMERA) += isp/
obj-$(CONFIG_MSMB_CAMERA) += ispif/
#obj-$(CONFIG_MSMB_JPEG) += jpeg_10/
#obj-$(CONFIG_MSM_JPEGDMA) += jpeg_dma/
#obj-$(CONFIG_MSMB_CAMERA) += msm_buf_mgr/
#obj-$(CONFIG_MSM_FD) += fd/
obj-$(CONFIG_MSMB_JPEG) += jpeg_10/
obj-$(CONFIG_MSM_JPEGDMA) += jpeg_dma/
obj-$(CONFIG_MSMB_CAMERA) += msm_buf_mgr/
obj-$(CONFIG_MSM_FD) += fd/

2
drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
View file

@ -1252,7 +1252,7 @@ int msm_isp_smmu_attach(struct msm_isp_buf_mgr *buf_mgr,
if (cmd->iommu_attach_mode == IOMMU_ATTACH) {
/* disable smmu stall on fault */
cam_smmu_set_attr(buf_mgr->iommu_hdl,
DOMAIN_ATTR_CB_STALL_DISABLE, &stall_disable);
DOMAIN_ATTR_FAULT_MODEL_NO_STALL, &stall_disable);
/*
* Call hypervisor thru scm call to notify secure or
* non-secure mode

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

@ -301,7 +301,7 @@ static void msm_enqueue(struct msm_device_queue *queue,
static int msm_cpp_notify_frame_done(struct cpp_device *cpp_dev,
uint8_t put_buf);
static int32_t cpp_load_fw(struct cpp_device *cpp_dev, char *fw_name_bin);
static void cpp_timer_callback(unsigned long data);
static void cpp_timer_callback(struct timer_list *cpp_t);
static uint8_t induce_error;
static int msm_cpp_enable_debugfs(struct cpp_device *cpp_dev);
@ -2039,7 +2039,7 @@ error:
pr_debug("%s:%d] exit\n", __func__, __LINE__);
}
static void cpp_timer_callback(unsigned long data)
static void cpp_timer_callback(struct timer_list *cpp_t)
{
struct msm_cpp_work_t *work =
cpp_timer.data.cpp_dev->work;
@ -3706,7 +3706,8 @@ STREAM_BUFF_END:
stall_disable = 1;
/* disable smmu stall on fault */
cam_smmu_set_attr(cpp_dev->iommu_hdl,
DOMAIN_ATTR_CB_STALL_DISABLE, &stall_disable);
DOMAIN_ATTR_FAULT_MODEL_NO_STALL,
&stall_disable);
if (cpp_dev->security_mode == SECURE_MODE) {
rc = cam_smmu_ops(cpp_dev->iommu_hdl,
CAM_SMMU_ATTACH_SEC_CPP);
@ -4743,8 +4744,8 @@ static int cpp_probe(struct platform_device *pdev)
atomic_set(&cpp_timer.used, 0);
/* install timer for cpp timeout */
CPP_DBG("Installing cpp_timer\n");
setup_timer(&cpp_timer.cpp_timer,
cpp_timer_callback, (unsigned long)&cpp_timer);
timer_setup(&cpp_timer.cpp_timer,
cpp_timer_callback, 0);
cpp_dev->fw_name_bin = NULL;
cpp_dev->max_timeout_trial_cnt = MSM_CPP_MAX_TIMEOUT_TRIAL;

167
include/media/msmb_pproc.h Normal file
View file

@ -0,0 +1,167 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* Copyright (c) 2018, 2020 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#ifndef __MSMB_PPROC_H
#define __MSMB_PPROC_H
#include <uapi/media/msmb_pproc.h>
#include <linux/compat.h>
#define MSM_OUTPUT_BUF_CNT 8
#ifdef CONFIG_COMPAT
struct msm_cpp_frame_info32_t {
int32_t frame_id;
struct compat_timeval timestamp;
uint32_t inst_id;
uint32_t identity;
uint32_t client_id;
enum msm_cpp_frame_type frame_type;
uint32_t num_strips;
uint32_t msg_len;
compat_uint_t cpp_cmd_msg;
int src_fd;
int dst_fd;
struct compat_timeval in_time, out_time;
compat_caddr_t cookie;
compat_int_t status;
int32_t duplicate_output;
uint32_t duplicate_identity;
uint32_t feature_mask;
uint8_t we_disable;
struct msm_cpp_buffer_info_t input_buffer_info;
struct msm_cpp_buffer_info_t output_buffer_info[MSM_OUTPUT_BUF_CNT];
struct msm_cpp_buffer_info_t duplicate_buffer_info;
struct msm_cpp_buffer_info_t tnr_scratch_buffer_info[2];
uint32_t reserved;
uint8_t partial_frame_indicator;
/* the following are used only for partial_frame type
* and is only used for offline frame processing and
* only if payload big enough and need to be split into partial_frame
* if first_payload, kernel acquires output buffer
* first payload must have the last stripe
* buffer addresses from 0 to last_stripe_index are updated.
* kernel updates payload with msg_len and stripe_info
* kernel sends top level, plane level, then only stripes
* starting with first_stripe_index and
* ends with last_stripe_index
* kernel then sends trailing flag at frame done,
* if last payload, kernel queues the output buffer to HAL
*/
uint8_t first_payload;
uint8_t last_payload;
uint32_t first_stripe_index;
uint32_t last_stripe_index;
uint32_t stripe_info_offset;
uint32_t stripe_info;
struct msm_cpp_batch_info_t batch_info;
};
struct msm_cpp_clock_settings32_t {
compat_long_t clock_rate;
uint64_t avg;
uint64_t inst;
};
struct msm_cpp_stream_buff_info32_t {
uint32_t identity;
uint32_t num_buffs;
compat_caddr_t buffer_info;
};
struct msm_pproc_queue_buf_info32_t {
struct msm_buf_mngr_info32_t buff_mgr_info;
uint8_t is_buf_dirty;
};
struct cpp_hw_info_32_t {
uint32_t cpp_hw_version;
uint32_t cpp_hw_caps;
compat_long_t freq_tbl[MAX_FREQ_TBL];
uint32_t freq_tbl_count;
};
#define VIDIOC_MSM_CPP_CFG32 \
_IOWR('V', BASE_VIDIOC_PRIVATE, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_CPP_GET_EVENTPAYLOAD32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_CPP_GET_INST_INFO32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 2, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_CPP_LOAD_FIRMWARE32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 3, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_CPP_GET_HW_INFO32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 4, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_CPP_FLUSH_QUEUE32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 5, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_CPP_ENQUEUE_STREAM_BUFF_INFO32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 6, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_CPP_DEQUEUE_STREAM_BUFF_INFO32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 7, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_VPE_CFG32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 8, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_VPE_TRANSACTION_SETUP32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 9, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_VPE_GET_EVENTPAYLOAD32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 10, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_VPE_GET_INST_INFO32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 11, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_VPE_ENQUEUE_STREAM_BUFF_INFO32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 12, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_VPE_DEQUEUE_STREAM_BUFF_INFO32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 13, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_CPP_QUEUE_BUF32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 14, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_CPP_APPEND_STREAM_BUFF_INFO32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 15, struct msm_camera_v4l2_ioctl32_t)
#define VIDIOC_MSM_CPP_SET_CLOCK32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 16, struct msm_camera_v4l2_ioctl32_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)
#define VIDIOC_MSM_CPP_DELETE_STREAM_BUFF32\
_IOWR('V', BASE_VIDIOC_PRIVATE + 20, struct msm_camera_v4l2_ioctl32_t)
struct msm_camera_v4l2_ioctl32_t {
uint32_t id;
uint32_t len;
int32_t trans_code;
compat_caddr_t ioctl_ptr;
};
#endif
#endif