Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6096c4e authored by Karthik Jayakumar's avatar Karthik Jayakumar
Browse files

msm: camera: uapi: Support for UAPI_HEADER_TEST config 



Aligns the uapi header types and includes to be in-line with upstream
kernel formatting. The errors are given by enabling the UAPI_HEADER_TEST
config, which is now enabled in GKI builds.

CRs-Fixed: 2679250
Change-Id: I195fb2aab9251043fc63d79dd31f2db53b1228f5
Signed-off-by: default avatarKarthik Jayakumar <kjayakum@codeaurora.org>
parent beb3ea37

include/uapi/camera/media/cam_cpas.h

+15 −15
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */

/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 */



#ifndef __UAPI_CAM_CPAS_H__

#define __UAPI_CAM_CPAS_H__



#include <media/cam_defs.h>

#include <camera/media/cam_defs.h>



#define CAM_FAMILY_CAMERA_SS     1

#define CAM_FAMILY_CPAS_SS       2
@@ -73,8 +73,8 @@ 
 *

 */

struct cam_cpas_query_cap {

	uint32_t                 camera_family;

	uint32_t                 reserved;

	__u32                 camera_family;

	__u32                 reserved;

	struct cam_hw_version camera_version;

	struct cam_hw_version cpas_version;

};
@@ -93,15 +93,15 @@ struct cam_cpas_query_cap { 
 * @ddr_ib_bw                DDR IB bw for this path

 */

struct cam_axi_per_path_bw_vote {

	uint32_t                      usage_data;

	uint32_t                      transac_type;

	uint32_t                      path_data_type;

	uint32_t                      reserved;

	uint64_t                      camnoc_bw;

	uint64_t                      mnoc_ab_bw;

	uint64_t                      mnoc_ib_bw;

	uint64_t                      ddr_ab_bw;

	uint64_t                      ddr_ib_bw;

	__u32                      usage_data;

	__u32                      transac_type;

	__u32                      path_data_type;

	__u32                      reserved;

	__u64                      camnoc_bw;

	__u64                      mnoc_ab_bw;

	__u64                      mnoc_ib_bw;

	__u64                      ddr_ab_bw;

	__u64                      ddr_ib_bw;

};



#endif /* __UAPI_CAM_CPAS_H__ */

include/uapi/camera/media/cam_custom.h

+55 −55
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */

/*

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

 */



#ifndef __UAPI_CAM_CUSTOM_H__

#define __UAPI_CAM_CUSTOM_H__



#include "cam_defs.h"

#include <camera/media/cam_defs.h>



/* Custom driver name */

#define CAM_CUSTOM_DEV_NAME                    "cam-custom"
@@ -53,8 +53,8 @@ 
 *

 */

struct cam_custom_dev_cap_info {

	uint32_t              hw_type;

	uint32_t              hw_version;

	__u32              hw_type;

	__u32              hw_version;

};



/**
@@ -70,8 +70,8 @@ struct cam_custom_dev_cap_info { 
struct cam_custom_query_cap_cmd {

	struct cam_iommu_handle        device_iommu;

	struct cam_iommu_handle        cdm_iommu;

	int32_t                         num_dev;

	uint32_t                        reserved;

	__s32                          num_dev;

	__u32                          reserved;

	struct cam_custom_dev_cap_info dev_caps[CAM_CUSTOM_NUM_SUB_DEVICES];

};
@@ -86,12 +86,12 @@ struct cam_custom_query_cap_cmd { 
 *

 */

struct cam_custom_out_port_info {

	uint32_t                res_type;

	uint32_t                format;

	uint32_t                custom_info1;

	uint32_t                custom_info2;

	uint32_t                custom_info3;

	uint32_t                reserved;

	__u32                res_type;

	__u32                format;

	__u32                custom_info1;

	__u32                custom_info2;

	__u32                custom_info3;

	__u32                reserved;

};



/**
@@ -125,30 +125,30 @@ struct cam_custom_out_port_info { 
 *

 */

struct cam_custom_in_port_info {

	uint32_t                        res_type;

	uint32_t                        lane_type;

	uint32_t                        lane_num;

	uint32_t                        lane_cfg;

	uint32_t                        vc[CAM_CUSTOM_VC_DT_CFG_MAX];

	uint32_t                        dt[CAM_CUSTOM_VC_DT_CFG_MAX];

	uint32_t                        num_valid_vc_dt;

	uint32_t                        format;

	uint32_t                        test_pattern;

	uint32_t                        usage_type;

	uint32_t                        left_start;

	uint32_t                        left_stop;

	uint32_t                        left_width;

	uint32_t                        right_start;

	uint32_t                        right_stop;

	uint32_t                        right_width;

	uint32_t                        line_start;

	uint32_t                        line_stop;

	uint32_t                        height;

	uint32_t                        pixel_clk;

	uint32_t                        num_bytes_out;

	uint32_t                        custom_info1;

	uint32_t                        custom_info2;

	uint32_t                        num_out_res;

	__u32                           res_type;

	__u32                           lane_type;

	__u32                           lane_num;

	__u32                           lane_cfg;

	__u32                           vc[CAM_CUSTOM_VC_DT_CFG_MAX];

	__u32                           dt[CAM_CUSTOM_VC_DT_CFG_MAX];

	__u32                           num_valid_vc_dt;

	__u32                           format;

	__u32                           test_pattern;

	__u32                           usage_type;

	__u32                           left_start;

	__u32                           left_stop;

	__u32                           left_width;

	__u32                           right_start;

	__u32                           right_stop;

	__u32                           right_width;

	__u32                           line_start;

	__u32                           line_stop;

	__u32                           height;

	__u32                           pixel_clk;

	__u32                           num_bytes_out;

	__u32                           custom_info1;

	__u32                           custom_info2;

	__u32                           num_out_res;

	struct cam_custom_out_port_info data[1];

};
@@ -163,11 +163,11 @@ struct cam_custom_in_port_info { 
 *                              resource array;

 */

struct cam_custom_resource {

	uint32_t                       resource_id;

	uint32_t                       length;

	uint32_t                       handle_type;

	uint32_t                       reserved;

	uint64_t                       res_hdl;

	__u32                       resource_id;

	__u32                       length;

	__u32                       handle_type;

	__u32                       reserved;

	__u64                       res_hdl;

};



/**
@@ -180,11 +180,11 @@ struct cam_custom_resource { 
 * @data                 : Start of data region

 */

struct cam_custom_acquire_hw_info {

	uint32_t                num_inputs;

	uint32_t                input_info_size;

	uint32_t                input_info_offset;

	uint32_t                reserved;

	uint64_t                data;

	__u32                num_inputs;

	__u32                input_info_size;

	__u32                input_info_offset;

	__u32                reserved;

	__u64                data;

};



/**
@@ -194,8 +194,8 @@ struct cam_custom_acquire_hw_info { 
 * @reserved:                   reserved

 */

struct cam_custom_cmd_buf_type_1 {

	uint32_t                       custom_info;

	uint32_t                       reserved;

	__u32                       custom_info;

	__u32                       reserved;

};



/**
@@ -207,9 +207,9 @@ struct cam_custom_cmd_buf_type_1 { 
 * @reserved:                   reserved

 */

struct cam_custom_cmd_buf_type_2 {

	uint32_t                       custom_info1;

	uint32_t                       custom_info2;

	uint32_t                       custom_info3;

	uint32_t                       reserved;

	__u32                       custom_info1;

	__u32                       custom_info2;

	__u32                       custom_info3;

	__u32                       reserved;

};

#endif /* __UAPI_CAM_CUSTOM_H__ */

include/uapi/camera/media/cam_defs.h

+178 −178
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */

/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 */



#ifndef __UAPI_CAM_DEFS_H__
@@ -85,11 +85,11 @@ enum flush_type_t { 
 * @handle:             Control command payload

 */

struct cam_control {

	uint32_t        op_code;

	uint32_t        size;

	uint32_t        handle_type;

	uint32_t        reserved;

	uint64_t        handle;

	__u32        op_code;

	__u32        size;

	__u32        handle_type;

	__u32        reserved;

	__u64        handle;

};



/* camera IOCTL */
@@ -105,10 +105,10 @@ struct cam_control { 
 * @reserved : Reserved for 64 bit aligngment

 */

struct cam_hw_version {

	uint32_t major;

	uint32_t minor;

	uint32_t incr;

	uint32_t reserved;

	__u32 major;

	__u32 minor;

	__u32 incr;

	__u32 reserved;

};



/**
@@ -119,8 +119,8 @@ struct cam_hw_version { 
 *

 */

struct cam_iommu_handle {

	int32_t non_secure;

	int32_t secure;

	__s32 non_secure;

	__s32 secure;

};



/* camera secure mode */
@@ -266,18 +266,18 @@ struct cam_iommu_handle { 
 *

 */

struct cam_plane_cfg {

	uint32_t                width;

	uint32_t                height;

	uint32_t                plane_stride;

	uint32_t                slice_height;

	uint32_t                meta_stride;

	uint32_t                meta_size;

	uint32_t                meta_offset;

	uint32_t                packer_config;

	uint32_t                mode_config;

	uint32_t                tile_config;

	uint32_t                h_init;

	uint32_t                v_init;

	__u32                width;

	__u32                height;

	__u32                plane_stride;

	__u32                slice_height;

	__u32                meta_stride;

	__u32                meta_size;

	__u32                meta_offset;

	__u32                packer_config;

	__u32                mode_config;

	__u32                tile_config;

	__u32                h_init;

	__u32                v_init;

};



/**
@@ -296,16 +296,16 @@ struct cam_plane_cfg { 
 *

 */

struct cam_ubwc_plane_cfg_v1 {

	uint32_t                port_type;

	uint32_t                meta_stride;

	uint32_t                meta_size;

	uint32_t                meta_offset;

	uint32_t                packer_config;

	uint32_t                mode_config_0;

	uint32_t                mode_config_1;

	uint32_t                tile_config;

	uint32_t                h_init;

	uint32_t                v_init;

	__u32                port_type;

	__u32                meta_stride;

	__u32                meta_size;

	__u32                meta_offset;

	__u32                packer_config;

	__u32                mode_config_0;

	__u32                mode_config_1;

	__u32                tile_config;

	__u32                h_init;

	__u32                v_init;

};



/**
@@ -329,24 +329,24 @@ struct cam_ubwc_plane_cfg_v1 { 
 *

 */

struct cam_ubwc_plane_cfg_v2 {

	uint32_t                port_type;

	uint32_t                meta_stride;

	uint32_t                meta_size;

	uint32_t                meta_offset;

	uint32_t                packer_config;

	uint32_t                mode_config_0;

	uint32_t                mode_config_1;

	uint32_t                tile_config;

	uint32_t                h_init;

	uint32_t                v_init;

	uint32_t                static_ctrl;

	uint32_t                ctrl_2;

	uint32_t                stats_ctrl_2;

	uint32_t                lossy_threshold_0;

	uint32_t                lossy_threshold_1;

	uint32_t                lossy_var_offset;

	uint32_t                bandwidth_limit;

	uint32_t                reserved[3];

	__u32                port_type;

	__u32                meta_stride;

	__u32                meta_size;

	__u32                meta_offset;

	__u32                packer_config;

	__u32                mode_config_0;

	__u32                mode_config_1;

	__u32                tile_config;

	__u32                h_init;

	__u32                v_init;

	__u32                static_ctrl;

	__u32                ctrl_2;

	__u32                stats_ctrl_2;

	__u32                lossy_threshold_0;

	__u32                lossy_threshold_1;

	__u32                lossy_var_offset;

	__u32                bandwidth_limit;

	__u32                reserved[3];

};

/**

 * struct cam_cmd_buf_desc - Command buffer descriptor
@@ -361,12 +361,12 @@ struct cam_ubwc_plane_cfg_v2 { 
 *

 */

struct cam_cmd_buf_desc {

	int32_t                 mem_handle;

	uint32_t                offset;

	uint32_t                size;

	uint32_t                length;

	uint32_t                type;

	uint32_t                meta_data;

	__s32                mem_handle;

	__u32                offset;

	__u32                size;

	__u32                length;

	__u32                type;

	__u32                meta_data;

};



/**
@@ -403,26 +403,26 @@ struct cam_cmd_buf_desc { 
 *

 */

struct cam_buf_io_cfg {

	int32_t                         mem_handle[CAM_PACKET_MAX_PLANES];

	uint32_t                        offsets[CAM_PACKET_MAX_PLANES];

	__s32                   mem_handle[CAM_PACKET_MAX_PLANES];

	__u32                   offsets[CAM_PACKET_MAX_PLANES];

	struct cam_plane_cfg    planes[CAM_PACKET_MAX_PLANES];

	uint32_t                        format;

	uint32_t                        color_space;

	uint32_t                        color_pattern;

	uint32_t                        bpp;

	uint32_t                        rotation;

	uint32_t                        resource_type;

	int32_t                         fence;

	int32_t                         early_fence;

	__u32                   format;

	__u32                   color_space;

	__u32                   color_pattern;

	__u32                   bpp;

	__u32                   rotation;

	__u32                   resource_type;

	__s32                   fence;

	__s32                   early_fence;

	struct cam_cmd_buf_desc aux_cmd_buf;

	uint32_t                        direction;

	uint32_t                        batch_size;

	uint32_t                        subsample_pattern;

	uint32_t                        subsample_period;

	uint32_t                        framedrop_pattern;

	uint32_t                        framedrop_period;

	uint32_t                        flag;

	uint32_t                        padding;

	__u32                   direction;

	__u32                   batch_size;

	__u32                   subsample_pattern;

	__u32                   subsample_period;

	__u32                   framedrop_pattern;

	__u32                   framedrop_period;

	__u32                   flag;

	__u32                   padding;

};



/**
@@ -436,11 +436,11 @@ struct cam_buf_io_cfg { 
 *

 */

struct cam_packet_header {

	uint32_t                op_code;

	uint32_t                size;

	uint64_t                request_id;

	uint32_t                flags;

	uint32_t                padding;

	__u32                op_code;

	__u32                size;

	__u64                request_id;

	__u32                flags;

	__u32                padding;

};



/**
@@ -453,10 +453,10 @@ struct cam_packet_header { 
 *

 */

struct cam_patch_desc {

	int32_t                 dst_buf_hdl;

	uint32_t                dst_offset;

	int32_t                 src_buf_hdl;

	uint32_t                src_offset;

	__s32                dst_buf_hdl;

	__u32                dst_offset;

	__s32                src_buf_hdl;

	__u32                src_offset;

};



/**
@@ -478,15 +478,15 @@ struct cam_patch_desc { 
 */

struct cam_packet {

	struct cam_packet_header     header;

	uint32_t                        cmd_buf_offset;

	uint32_t                        num_cmd_buf;

	uint32_t                        io_configs_offset;

	uint32_t                        num_io_configs;

	uint32_t                        patch_offset;

	uint32_t                        num_patches;

	uint32_t                        kmd_cmd_buf_index;

	uint32_t                        kmd_cmd_buf_offset;

	uint64_t                        payload[1];

	__u32                        cmd_buf_offset;

	__u32                        num_cmd_buf;

	__u32                        io_configs_offset;

	__u32                        num_io_configs;

	__u32                        patch_offset;

	__u32                        num_patches;

	__u32                        kmd_cmd_buf_index;

	__u32                        kmd_cmd_buf_offset;

	__u64                        payload[1];



};
@@ -497,8 +497,8 @@ struct cam_packet { 
 * @dev_handle:                 Device handle for the release

 */

struct cam_release_dev_cmd {

	int32_t                 session_handle;

	int32_t                 dev_handle;

	__s32                 session_handle;

	__s32                 dev_handle;

};



/**
@@ -509,8 +509,8 @@ struct cam_release_dev_cmd { 
 *

 */

struct cam_start_stop_dev_cmd {

	int32_t                 session_handle;

	int32_t                 dev_handle;

	__s32                 session_handle;

	__s32                 dev_handle;

};



/**
@@ -524,10 +524,10 @@ struct cam_start_stop_dev_cmd { 
 *

 */

struct cam_config_dev_cmd {

	int32_t                 session_handle;

	int32_t                 dev_handle;

	uint64_t                offset;

	uint64_t                packet_handle;

	__s32                session_handle;

	__s32                dev_handle;

	__u64                offset;

	__u64                packet_handle;

};



/**
@@ -539,9 +539,9 @@ struct cam_config_dev_cmd { 
 *

 */

struct cam_query_cap_cmd {

	uint32_t        size;

	uint32_t        handle_type;

	uint64_t        caps_handle;

	__u32        size;

	__u32        handle_type;

	__u64        caps_handle;

};



/**
@@ -558,11 +558,11 @@ struct cam_query_cap_cmd { 
 *

 */

struct cam_acquire_dev_cmd {

	int32_t         session_handle;

	int32_t         dev_handle;

	uint32_t        handle_type;

	uint32_t        num_resources;

	uint64_t        resource_hdl;

	__s32        session_handle;

	__s32        dev_handle;

	__u32        handle_type;

	__u32        num_resources;

	__u64        resource_hdl;

};



/*
@@ -575,7 +575,7 @@ struct cam_acquire_dev_cmd { 
 * ACQUIRE_HW IOCTL after ACQUIRE_DEV and that is when the HW

 * is associated with the dev_handle.

 *

 * (Data type): uint32_t

 * (Data type): __u32

 */

#define CAM_API_COMPAT_CONSTANT                   0xFEFEFEFE
@@ -602,13 +602,13 @@ struct cam_acquire_dev_cmd { 
 *                      resource data.

 */

struct cam_acquire_hw_cmd_v1 {

	uint32_t        struct_version;

	uint32_t        reserved;

	int32_t         session_handle;

	int32_t         dev_handle;

	uint32_t        handle_type;

	uint32_t        data_size;

	uint64_t        resource_hdl;

	__u32        struct_version;

	__u32        reserved;

	__s32        session_handle;

	__s32        dev_handle;

	__u32        handle_type;

	__u32        data_size;

	__u64        resource_hdl;

};



/**
@@ -621,9 +621,9 @@ struct cam_acquire_hw_cmd_v1 { 
 * valid_acquired_hw:   Valid num of acquired hardware

 */

struct cam_acquired_hw_info {

	uint32_t    acquired_hw_id[CAM_MAX_ACQ_RES];

	uint32_t    acquired_hw_path[CAM_MAX_ACQ_RES][CAM_MAX_HW_SPLIT];

	uint32_t    valid_acquired_hw;

	__u32    acquired_hw_id[CAM_MAX_ACQ_RES];

	__u32    acquired_hw_path[CAM_MAX_ACQ_RES][CAM_MAX_HW_SPLIT];

	__u32    valid_acquired_hw;

};



/**
@@ -646,13 +646,13 @@ struct cam_acquired_hw_info { 
 *                      resource data.

 */

struct cam_acquire_hw_cmd_v2 {

	uint32_t                    struct_version;

	uint32_t                    reserved;

	int32_t                     session_handle;

	int32_t                     dev_handle;

	uint32_t                    handle_type;

	uint32_t                    data_size;

	uint64_t                    resource_hdl;

	__u32                    struct_version;

	__u32                    reserved;

	__s32                    session_handle;

	__s32                    dev_handle;

	__u32                    handle_type;

	__u32                    data_size;

	__u64                    resource_hdl;

	struct cam_acquired_hw_info hw_info;

};
@@ -672,10 +672,10 @@ struct cam_acquire_hw_cmd_v2 { 
 * @dev_handle:         Device handle for the release

 */

struct cam_release_hw_cmd_v1 {

	uint32_t                struct_version;

	uint32_t                reserved;

	int32_t                 session_handle;

	int32_t                 dev_handle;

	__u32                struct_version;

	__u32                reserved;

	__s32                session_handle;

	__s32                dev_handle;

};



/**
@@ -692,12 +692,12 @@ struct cam_release_hw_cmd_v1 { 
 *

 */

struct cam_flush_dev_cmd {

	uint64_t       version;

	int32_t        session_handle;

	int32_t        dev_handle;

	uint32_t       flush_type;

	uint32_t       reserved;

	int64_t        req_id;

	__u64       version;

	__s32       session_handle;

	__s32       dev_handle;

	__u32       flush_type;

	__u32       reserved;

	__s64       req_id;

};



/**
@@ -712,8 +712,8 @@ struct cam_flush_dev_cmd { 
 *

 */

struct cam_ubwc_config {

	uint32_t   api_version;

	uint32_t   num_ports;

	__u32   api_version;

	__u32   num_ports;

	struct cam_ubwc_plane_cfg_v1

		   ubwc_plane_cfg[1][CAM_PACKET_MAX_PLANES - 1];

};
@@ -730,8 +730,8 @@ struct cam_ubwc_config { 
 *

 */

struct cam_ubwc_config_v2 {

	uint32_t   api_version;

	uint32_t   num_ports;

	__u32   api_version;

	__u32   num_ports;

	struct cam_ubwc_plane_cfg_v2

	   ubwc_plane_cfg[1][CAM_PACKET_MAX_PLANES - 1];

};
@@ -746,10 +746,10 @@ struct cam_ubwc_config_v2 { 
 * @flags      : Flags if any

 */

struct cam_cmd_mem_region_info {

	int32_t   mem_handle;

	uint32_t  offset;

	uint32_t  size;

	uint32_t  flags;

	__s32 mem_handle;

	__u32 offset;

	__u32 size;

	__u32 flags;

};



/**
@@ -762,8 +762,8 @@ struct cam_cmd_mem_region_info { 
 * @map_info_array : Array of all the regions

 */

struct cam_cmd_mem_regions {

	uint32_t version;

	uint32_t num_regions;

	__u32 version;

	__u32 num_regions;

	struct cam_cmd_mem_region_info map_info_array[1];

};
@@ -774,8 +774,8 @@ struct cam_cmd_mem_regions { 
 * @value                : Register value to write

 */

struct cam_reg_write_desc {

	uint32_t   offset;

	uint32_t   value;

	__u32 offset;

	__u32 value;

};



/**
@@ -785,8 +785,8 @@ struct cam_reg_write_desc { 
 * @num_values           : Number of values to read

 */

struct cam_reg_range_read_desc {

	uint32_t   offset;

	uint32_t   num_values;

	__u32   offset;

	__u32   num_values;

};



/**
@@ -800,8 +800,8 @@ struct cam_reg_range_read_desc { 
 * @post_read_config     : Registers to write after reading DMI data

 */

struct cam_dmi_read_desc {

	uint32_t                         num_pre_writes;

	uint32_t                         num_post_writes;

	__u32                         num_pre_writes;

	__u32                         num_post_writes;

	struct cam_reg_write_desc        pre_read_config[

						CAM_REG_DUMP_DMI_CONFIG_MAX];

	struct cam_reg_range_read_desc   dmi_data_read;
@@ -818,8 +818,8 @@ struct cam_dmi_read_desc { 
 * @dmi_read             : DMI data to read

 */

struct cam_reg_read_info {

	uint32_t                                type;

	uint32_t                                reserved;

	__u32                                  type;

	__u32                                  reserved;

	union {

		struct cam_reg_range_read_desc reg_read;

		struct cam_dmi_read_desc       dmi_read;
@@ -834,9 +834,9 @@ struct cam_reg_read_info { 
 * @dump_data            : Register dump data

 */

struct cam_reg_dump_out_buffer {

	uint64_t   req_id;

	uint32_t   bytes_written;

	uint32_t   dump_data[1];

	__u64   req_id;

	__u32   bytes_written;

	__u32   dump_data[1];

};



/**
@@ -850,10 +850,10 @@ struct cam_reg_dump_out_buffer { 
 * @read_range           : Read range info

 */

struct cam_reg_dump_desc {

	uint32_t                   reg_base_type;

	uint32_t                   dump_buffer_offset;

	uint32_t                   dump_buffer_size;

	uint32_t                   num_read_range;

	__u32                    reg_base_type;

	__u32                    dump_buffer_offset;

	__u32                    dump_buffer_size;

	__u32                    num_read_range;

	struct cam_reg_read_info read_range[1];

};
@@ -865,8 +865,8 @@ struct cam_reg_dump_desc { 
 *                         (cam_reg_dump_desc)

 */

struct cam_reg_dump_input_info {

	uint32_t                   num_dump_sets;

	uint32_t                   dump_set_offsets[1];

	__u32                   num_dump_sets;

	__u32                   dump_set_offsets[1];

};



/**
@@ -882,13 +882,13 @@ struct cam_reg_dump_input_info { 
 * @dev_handle     : Device Handle

 */

struct cam_dump_req_cmd {

	uint64_t       issue_req_id;

	size_t         offset;

	uint32_t       buf_handle;

	uint32_t       error_type;

	int32_t        session_handle;

	int32_t        link_hdl;

	int32_t        dev_handle;

	__u64           issue_req_id;

	__kernel_size_t offset;

	__u32           buf_handle;

	__u32           error_type;

	__s32           session_handle;

	__s32           link_hdl;

	__s32           dev_handle;

};



#endif /* __UAPI_CAM_DEFS_H__ */

include/uapi/camera/media/cam_fd.h

+25 −25
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */

/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 */



#ifndef __UAPI_CAM_FD_H__

#define __UAPI_CAM_FD_H__



#include <media/cam_defs.h>

#include <camera/media/cam_defs.h>



#define CAM_FD_MAX_FACES                       35

#define CAM_FD_RAW_RESULT_ENTRIES              512
@@ -40,9 +40,9 @@ 
 * @reserved   : Reserved for future use

 */

struct cam_fd_soc_clock_bw_request {

	uint64_t    clock_rate;

	uint64_t    bandwidth;

	uint64_t    reserved[4];

	__u64    clock_rate;

	__u64    bandwidth;

	__u64    reserved[4];

};



/**
@@ -57,10 +57,10 @@ struct cam_fd_soc_clock_bw_request { 
 * these values directly when the buffer is programmed to HW

 */

struct cam_fd_face {

	uint32_t    prop1;

	uint32_t    prop2;

	uint32_t    prop3;

	uint32_t    prop4;

	__u32    prop1;

	__u32    prop2;

	__u32    prop3;

	__u32    prop4;

};



/**
@@ -75,8 +75,8 @@ struct cam_fd_face { 
 */

struct cam_fd_results {

	struct cam_fd_face faces[CAM_FD_MAX_FACES];

	uint32_t              face_count;

	uint32_t              reserved[3];

	__u32              face_count;

	__u32              reserved[3];

};



/**
@@ -91,9 +91,9 @@ struct cam_fd_results { 
struct cam_fd_hw_caps {

	struct cam_hw_version core_version;

	struct cam_hw_version wrapper_version;

	uint32_t                 raw_results_available;

	uint32_t                 supported_modes;

	uint64_t                 reserved;

	__u32                 raw_results_available;

	__u32                 supported_modes;

	__u64                 reserved;

};



/**
@@ -108,7 +108,7 @@ struct cam_fd_query_cap_cmd { 
	struct cam_iommu_handle device_iommu;

	struct cam_iommu_handle cdm_iommu;

	struct cam_fd_hw_caps   hw_caps;

	uint64_t                   reserved;

	__u64                   reserved;

};



/**
@@ -123,10 +123,10 @@ struct cam_fd_query_cap_cmd { 
 */

struct cam_fd_acquire_dev_info {

	struct cam_fd_soc_clock_bw_request clk_bw_request;

	uint32_t                           priority;

	uint32_t                           mode;

	uint32_t                           get_raw_results;

	uint32_t                           reserved[13];

	__u32                              priority;

	__u32                              mode;

	__u32                              get_raw_results;

	__u32                              reserved[13];

};



#endif /* __UAPI_CAM_FD_H__ */

include/uapi/camera/media/cam_icp.h

+36 −36

File changed.

Preview size limit exceeded, changes collapsed.