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

Merge commit '03ccc5e01f2f4eccd3814d69922e502ec0cd8b2c'

Browse Source 
* commit '03ccc5e01f2f4eccd3814d69922e502ec0cd8b2c':
  arm64: dts: rockchip: rv1126bp-evb-v14: Adjust the matching voltage
  media: rockchip: aiisp: delete one temp buffer to reduce memory
  media: rockchip: isp: mp output buf notice to aiisp
  media: rockchip: aiisp: modify for aiynr algo
  rtc: rockchip: add ready flag for rtc setting time
  soc: rockchip: cpuinfo: export chip unique id to userspace
  media: rockchip: vpss: offline mode support auto unite output
  drm/rockchip: vop2: Add "DIMMING_DATA" property for local dimming
  media: rockchip: isp: aiisp switch for offline mode
  media: rockchip: isp: aiisp switch for isp35
  media: rockchip: isp: support aiisp yuv mode
  input: touchscreen: gt1x: prefix global variables and functions with "gt1x_"
  MALI: valhall: add gpu mem sysfs entry
  drm/rockchip: Make the DRM panel as part of Rockchip DRM sub devices for panel loader protect
  drm/rockchip: Pass struct rockchip_drm_sub_dev for &rockchip_drm_sub_dev.loader_protect()

Change-Id: I61809a96152857eb7f0728a6fe49af919bf0fbbb
This commit is contained in:
Tao Huang
2025-07-07 18:53:19 +08:00
parent db9d44edef 03ccc5e01f
commit cabbe77ee5
47 changed files with 1372 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/uapi/linux/rk-aiisp-config.h
View File

@@ -10,10 +10,12 @@
#include <linux/rk-isp2-config.h>
#define RKAIISP_PYRAMID_LAYER_NUM 4
#define RKAIISP_AIYNR_LAYER_NUM 5
#define RKAIISP_MAX_RUNCNT 8
#define RKAIISP_MAX_ISPBUF 8
#define RKAIISP_MODEL_UPDATE 0x01
#define RKAIISP_OTHER_UPDATE 0x02
#define RKAIISP_AIYNR_YBUF_NUM_MAX 8
#define RKAIISP_CMD_SET_PARAM_INFO \
_IOW('V', BASE_VIDIOC_PRIVATE + 0, struct rkaiisp_param_info)
@@ -30,6 +32,9 @@
#define RKAIISP_CMD_INIT_AIRMS_BUFPOOL \
_IOWR('V', BASE_VIDIOC_PRIVATE + 4, struct rkaiisp_rmsbuf_info)
#define RKAIISP_CMD_GET_YNRBUF_INFO \
_IOR('V', BASE_VIDIOC_PRIVATE + 5, struct rkaiisp_ynrbuf_info)
/**********************EVENT_PRIVATE***************************/
#define RKAIISP_V4L2_EVENT_AIISP_DONE (V4L2_EVENT_PRIVATE_START + 1)
@@ -50,7 +55,8 @@ enum rkaiisp_chn_src {
AIISP_LAST_OUT,
VICAP_BAYER_RAW,
ALLZERO_SIGMA,
ALLZERO_NARMAP
ALLZERO_NARMAP,
ISP_FINAL_Y
};
enum rkaiisp_exealgo {
@@ -63,7 +69,8 @@ enum rkaiisp_model_mode {
SINGLE_MODE,
COMBO_MODE,
SINGLEX2_MODE,
REMOSAIC_MODE
REMOSAIC_MODE,
AIYNR_MODE
};
enum rkaiisp_exemode {
@@ -115,6 +122,13 @@ struct rkaiisp_rmsbuf_info {
int outbuf_fd[6];
} __attribute__ ((packed));
struct rkaiisp_ynrbuf_info {
int width;
int height;
__u32 buf_cnt;
int dma_fd[RKAIISP_AIYNR_YBUF_NUM_MAX];
} __attribute__ ((packed));
struct rkaiisp_other_cfg {
__u16 sw_neg_noiselimit;
__u16 sw_pos_noiselimit;

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

@@ -436,6 +436,9 @@ struct rkisp_aiisp_ev_info {
int vpsl_index;
int aiisp_index;
int y_src_index;
int y_dest_index;
} __attribute__ ((packed));
struct rkisp_aiisp_st {
@@ -449,17 +452,22 @@ struct rkisp_aiisp_st {
int aipre_gain_index;
int vpsl_index;
int y_src_index;
int y_dest_index;
} __attribute__ ((packed));
/* struct rkisp_aiisp_cfg
* mode: 0: disable aiisp, 1:enable aiisp
* wr_linecnt: aiisp write irq line
* rd_linecnt: aiisp read irq line
* mode: 0:isp whole 1:isp divided into isp_fe and isp_be
* wr_linecnt: btnr iir write irq line
* rd_linecnt: isp_be read irq line
* wr_mode: 0:frame with only one RKISP_AIISP_WR_LINECNT_ID event, else event per wr_linecnt
*/
struct rkisp_aiisp_cfg {
int mode;
int wr_linecnt;
int rd_linecnt;
int wr_mode;
} __attribute__ ((packed));
#define VPSL_YRAW_CHN_MAX 6
@@ -481,6 +489,7 @@ struct rkisp_bnr_buf_info {
struct rkisp_buf_info gain;
struct rkisp_buf_info aipre_gain;
struct rkisp_buf_info vpsl;
struct rkisp_buf_info y_src;
__u8 iir_rw_fmt;
__u8 gain_mode;
__u8 yraw_sel;