From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/drivers/media/platform/rockchip/ispp/params.h | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/kernel/drivers/media/platform/rockchip/ispp/params.h b/kernel/drivers/media/platform/rockchip/ispp/params.h
index d624f86..912e201 100644
--- a/kernel/drivers/media/platform/rockchip/ispp/params.h
+++ b/kernel/drivers/media/platform/rockchip/ispp/params.h
@@ -4,7 +4,8 @@
#ifndef _RKISPP_PARAMS_H
#define _RKISPP_PARAMS_H
-#include <linux/rkispp-config.h>
+#include <linux/fec-config.h>
+#include <linux/rk-ispp-config.h>
#include "common.h"
enum rkispp_paramvdev_id {
@@ -13,6 +14,25 @@
PARAM_VDEV_FEC,
PARAM_VDEV_MAX
};
+
+#define ISPP_PACK_4BYTE(a, b, c, d) \
+ (((a) & 0xFF) << 0 | ((b) & 0xFF) << 8 | \
+ ((c) & 0xFF) << 16 | ((d) & 0xFF) << 24)
+
+#define ISPP_PACK_4BIT(a, b, c, d, e, f, g, h) \
+ (((a) & 0xf) << 0 | ((b) & 0xf) << 4 | \
+ ((c) & 0xf) << 8 | ((d) & 0xf) << 12 | \
+ ((e) & 0xf) << 16 | ((f) & 0xf) << 20 | \
+ ((g) & 0xf) << 24 | ((h) & 0xf) << 28)
+
+#define ISPP_PACK_4BYTE(a, b, c, d) \
+ (((a) & 0xFF) << 0 | ((b) & 0xFF) << 8 | \
+ ((c) & 0xFF) << 16 | ((d) & 0xFF) << 24)
+
+#define ISPP_PACK_2SHORT(a, b) \
+ (((a) & 0xFFFF) << 0 | ((b) & 0xFFFF) << 16)
+
+#define ISPP_NOBIG_OVERFLOW_SIZE (2560 * 1440)
/* rkispp parameters device
* config_lock: lock to protect config
@@ -23,6 +43,7 @@
struct rkispp_params_vdev {
struct rkispp_vdev_node vnode;
struct rkispp_device *dev;
+ struct rkispp_params_ops *params_ops;
spinlock_t config_lock;
struct list_head params;
@@ -39,11 +60,16 @@
enum rkispp_paramvdev_id vdev_id;
};
+struct rkispp_params_ops {
+ void (*rkispp_params_cfg)(struct rkispp_params_vdev *params_vdev, u32 frame_id);
+ void (*rkispp_params_vb2_buf_queue)(struct vb2_buffer *vb);
+};
+
int rkispp_register_params_vdevs(struct rkispp_device *dev);
void rkispp_unregister_params_vdevs(struct rkispp_device *dev);
-void rkispp_params_cfg(struct rkispp_params_vdev *params_vdev, u32 frame_id);
void rkispp_params_get_fecbuf_inf(struct rkispp_params_vdev *params_vdev,
struct rkispp_fecbuf_info *fecbuf);
void rkispp_params_set_fecbuf_size(struct rkispp_params_vdev *params_vdev,
struct rkispp_fecbuf_size *fecsize);
+
#endif
--
Gitblit v1.6.2