shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '8c9c0c25d5bdbb8720caa726c810e340f9e86a01'

Browse Source 
* commit '8c9c0c25d5bdbb8720caa726c810e340f9e86a01': (133 commits)
  arm64/configs: add rk3308bs_mipi_display.config for support mipi display
  arm64: dts: rockchip: rk3399-evb: use multicodecs instead simple card
  media: rockchip: vicap: fixes create dummuy buffer fail with size 0
  drm/bridge/synopsys: dw-hdmi-qp: Add support for external bridge
  video: rockchip: vehicle: remove vehicle dev when exit
  PCIe: dw: rockchip: rework compliance test settings
  drm/rockchip: direct_show: add cached buf cpu access begin & end
  media: rockchip: isp: add api get isp work mode for rockit
  media: i2c: rk628: fix 5V detect event report
  media: rockchip: isp: fix refer to sram info for multi sensor
  media: rockchip: isp: fix stream init pause state
  mtd: spinand: xtx: Fix XT26G11C ecc status ops
  net: can: rockchip: support rk3568 can v2
  drm/rockchip: dsi: set vop2 standby before command mode in rk3566/rk3568
  phy: rockchip: csi2-dphy: fixes hw_dev num error for rk3562
  video: rockchip: mpp: fix share reset_group do not take effect
  arm64: dts: rockchip: update rk3399-sapphire-excavator-lp4-linux.dts
  ARM: dts: rockchip: fix timing configs of panel k350c4516t for rv1103/rv1106 evb
  drm/rockchip: rgb: add mcu_max_dclk_rate for mode_valid check
  drm/rockchip: drv: fix the dclk calculation of mcu interface
  ...

Change-Id: I5e119fe1707975aa9d2859d02f4c7ac9462f91c4
This commit is contained in:
Tao Huang
2023-08-11 15:17:47 +08:00
parent a262d9ad5c 8c9c0c25d5
commit dfcec998e2
180 changed files with 13167 additions and 1719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/uapi/drm/rockchip_drm.h
View File

@@ -91,6 +91,7 @@ enum rockchip_crtc_feture {
ROCKCHIP_DRM_CRTC_FEATURE_ALPHA_SCALE,
ROCKCHIP_DRM_CRTC_FEATURE_HDR10,
ROCKCHIP_DRM_CRTC_FEATURE_NEXT_HDR,
ROCKCHIP_DRM_CRTC_FEATURE_VIVID_HDR,
};
enum rockchip_plane_feture {

42
include/uapi/linux/rk-camera-module.h
View File

@@ -58,6 +58,7 @@
RKMODULE_CAMERA_BT656_CHANNEL_3)
#define DPHY_MAX_LANE 4
#define RKMODULE_MULTI_DEV_NUM 4
#define RKMODULE_GET_MODULE_INFO \
_IOR('V', BASE_VIDIOC_PRIVATE + 0, struct rkmodule_inf)
@@ -176,6 +177,12 @@
#define RKMODULE_SET_GROUP_ID \
_IOW('V', BASE_VIDIOC_PRIVATE + 38, __u32)
#define RKMODULE_GET_CAPTURE_MODE \
_IOR('V', BASE_VIDIOC_PRIVATE + 39, struct rkmodule_capture_info)
#define RKMODULE_SET_CAPTURE_MODE \
_IOW('V', BASE_VIDIOC_PRIVATE + 40, struct rkmodule_capture_info)
struct rkmodule_i2cdev_info {
__u8 slave_addr;
} __attribute__ ((packed));
@@ -766,4 +773,39 @@ struct rkmodule_sensor_infos {
struct rkmodule_sensor_fmt sensor_fmt[RKMODULE_MAX_SENSOR_NUM];
};
enum rkmodule_capture_mode {
RKMODULE_CAPTURE_MODE_NONE = 0,
RKMODULE_MULTI_DEV_COMBINE_ONE,
RKMODULE_ONE_CH_TO_MULTI_ISP,
RKMODULE_MULTI_CH_TO_MULTI_ISP,
RKMODULE_MULTI_CH_COMBINE_SQUARE,
};
struct rkmodule_multi_dev_info {
__u32 dev_idx[RKMODULE_MULTI_DEV_NUM];
__u32 combine_idx[RKMODULE_MULTI_DEV_NUM];
__u32 pixel_offset;
__u32 dev_num;
__u32 reserved[8];
};
struct rkmodule_one_to_multi_info {
__u32 isp_num;
__u32 frame_pattern[RKMODULE_MULTI_DEV_NUM];
};
struct rkmodule_multi_combine_info {
__u32 combine_num;
__u32 combine_index[RKMODULE_MULTI_DEV_NUM];
};
struct rkmodule_capture_info {
__u32 mode;
union {
struct rkmodule_multi_dev_info multi_dev;
struct rkmodule_one_to_multi_info one_to_multi;
struct rkmodule_multi_combine_info multi_combine_info;
};
};
#endif /* _UAPI_RKMODULE_CAMERA_H */

2
include/uapi/linux/rk-isp2-config.h
View File

@@ -11,7 +11,7 @@
#include <linux/types.h>
#include <linux/v4l2-controls.h>
#define RKISP_API_VERSION KERNEL_VERSION(2, 2, 1)
#define RKISP_API_VERSION KERNEL_VERSION(2, 2, 2)
/****************ISP SUBDEV IOCTL*****************************/

12
include/uapi/linux/rkcif-config.h
View File

@@ -9,7 +9,9 @@
#include <linux/types.h>
#include <linux/v4l2-controls.h>
#define RKCIF_API_VERSION KERNEL_VERSION(0, 1, 0xa)
#define RKCIF_MAX_CSI_NUM 4
#define RKCIF_API_VERSION KERNEL_VERSION(0, 2, 0)
#define V4L2_EVENT_RESET_DEV 0X1001
@@ -32,7 +34,7 @@
_IOW('V', BASE_VIDIOC_PRIVATE + 6, int)
#define RKCIF_CMD_SET_CSI_IDX \
_IOW('V', BASE_VIDIOC_PRIVATE + 7, unsigned int)
_IOW('V', BASE_VIDIOC_PRIVATE + 7, struct rkcif_csi_info)
/* cif memory mode
* 0: raw12/raw10/raw8 8bit memory compact
@@ -71,4 +73,10 @@ struct rkcif_fps {
int fps;
};
struct rkcif_csi_info {
int csi_num;
int csi_idx[RKCIF_MAX_CSI_NUM];
int dphy_vendor[RKCIF_MAX_CSI_NUM];
};
#endif