mirror of
https://github.com/armbian/build.git
synced 2025-09-17 19:51:31 +02:00
d1186b8a0e
I have changed the way the patches are generated a bit. Instead of using orange-pi branch from megous tree for 6.6 kernel, I have used the following kernel branches a83t-suspend, af8133j, anx, audio, axp, cam, drm, err, fixes, mbus, modem, opi3, pb, pinetab, pp, ppkb, samuel, speed, tbs-a711, ths These branches were carefully chosen to include only allwinner related patches and remove importing of the rockchip related patches into the allwinner kernel. Following patches are modified to fix patch application failure - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch - patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch - patches.armbian/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch - patches.armbian/arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64.patch - patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch Following patches are modified because of kernel api change to fix compilation failure - patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch
208 lines
7.2 KiB
Diff
208 lines
7.2 KiB
Diff
From b867585f3054ab77f6dc2205ae322ed2ccb99832 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
Date: Sat, 9 Nov 2019 14:12:42 +0100
|
|
Subject: [PATCH 036/170] drv:media: cedrus: h264: Improve buffer management
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
---
|
|
drivers/staging/media/sunxi/cedrus/cedrus.h | 3 +
|
|
.../staging/media/sunxi/cedrus/cedrus_h264.c | 95 ++++++++-----------
|
|
2 files changed, 44 insertions(+), 54 deletions(-)
|
|
|
|
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h
|
|
index 1b20e23ee..ef9f1d9c8 100644
|
|
--- a/drivers/staging/media/sunxi/cedrus/cedrus.h
|
|
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
|
|
@@ -106,6 +106,9 @@ struct cedrus_buffer {
|
|
struct {
|
|
unsigned int position;
|
|
enum cedrus_h264_pic_type pic_type;
|
|
+ void *mv_col_buf;
|
|
+ dma_addr_t mv_col_buf_dma;
|
|
+ ssize_t mv_col_buf_size;
|
|
} h264;
|
|
struct {
|
|
void *mv_col_buf;
|
|
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
|
|
index d8fb93035..281909c57 100644
|
|
--- a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
|
|
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
|
|
@@ -55,16 +55,14 @@ static void cedrus_h264_write_sram(struct cedrus_dev *dev,
|
|
}
|
|
|
|
static dma_addr_t cedrus_h264_mv_col_buf_addr(struct cedrus_ctx *ctx,
|
|
- unsigned int position,
|
|
+ struct cedrus_buffer *buf,
|
|
unsigned int field)
|
|
{
|
|
- dma_addr_t addr = ctx->codec.h264.mv_col_buf_dma;
|
|
-
|
|
- /* Adjust for the position */
|
|
- addr += position * ctx->codec.h264.mv_col_buf_field_size * 2;
|
|
+ dma_addr_t addr = buf->codec.h264.mv_col_buf_dma;
|
|
|
|
/* Adjust for the field */
|
|
- addr += field * ctx->codec.h264.mv_col_buf_field_size;
|
|
+ if (field)
|
|
+ addr += buf->codec.h264.mv_col_buf_size / 2;
|
|
|
|
return addr;
|
|
}
|
|
@@ -76,7 +74,6 @@ static void cedrus_fill_ref_pic(struct cedrus_ctx *ctx,
|
|
struct cedrus_h264_sram_ref_pic *pic)
|
|
{
|
|
struct vb2_buffer *vbuf = &buf->m2m_buf.vb.vb2_buf;
|
|
- unsigned int position = buf->codec.h264.position;
|
|
|
|
pic->top_field_order_cnt = cpu_to_le32(top_field_order_cnt);
|
|
pic->bottom_field_order_cnt = cpu_to_le32(bottom_field_order_cnt);
|
|
@@ -85,9 +82,9 @@ static void cedrus_fill_ref_pic(struct cedrus_ctx *ctx,
|
|
pic->luma_ptr = cpu_to_le32(cedrus_buf_addr(vbuf, &ctx->dst_fmt, 0));
|
|
pic->chroma_ptr = cpu_to_le32(cedrus_buf_addr(vbuf, &ctx->dst_fmt, 1));
|
|
pic->mv_col_top_ptr =
|
|
- cpu_to_le32(cedrus_h264_mv_col_buf_addr(ctx, position, 0));
|
|
+ cpu_to_le32(cedrus_h264_mv_col_buf_addr(ctx, buf, 0));
|
|
pic->mv_col_bot_ptr =
|
|
- cpu_to_le32(cedrus_h264_mv_col_buf_addr(ctx, position, 1));
|
|
+ cpu_to_le32(cedrus_h264_mv_col_buf_addr(ctx, buf, 1));
|
|
}
|
|
|
|
static void cedrus_write_frame_list(struct cedrus_ctx *ctx,
|
|
@@ -146,6 +143,28 @@ static void cedrus_write_frame_list(struct cedrus_ctx *ctx,
|
|
output_buf = vb2_to_cedrus_buffer(&run->dst->vb2_buf);
|
|
output_buf->codec.h264.position = position;
|
|
|
|
+ if (!output_buf->codec.h264.mv_col_buf_size) {
|
|
+ const struct v4l2_ctrl_h264_sps *sps = run->h264.sps;
|
|
+ unsigned int field_size;
|
|
+
|
|
+ field_size = DIV_ROUND_UP(ctx->src_fmt.width, 16) *
|
|
+ DIV_ROUND_UP(ctx->src_fmt.height, 16) * 16;
|
|
+ if (!(sps->flags & V4L2_H264_SPS_FLAG_DIRECT_8X8_INFERENCE))
|
|
+ field_size = field_size * 2;
|
|
+ if (!(sps->flags & V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY))
|
|
+ field_size = field_size * 2;
|
|
+
|
|
+ output_buf->codec.h264.mv_col_buf_size = field_size * 2;
|
|
+ output_buf->codec.h264.mv_col_buf =
|
|
+ dma_alloc_attrs(dev->dev,
|
|
+ output_buf->codec.h264.mv_col_buf_size,
|
|
+ &output_buf->codec.h264.mv_col_buf_dma,
|
|
+ GFP_KERNEL, DMA_ATTR_NO_KERNEL_MAPPING);
|
|
+
|
|
+ if (!output_buf->codec.h264.mv_col_buf)
|
|
+ output_buf->codec.h264.mv_col_buf_size = 0;
|
|
+ }
|
|
+
|
|
if (decode->flags & V4L2_H264_DECODE_PARAM_FLAG_FIELD_PIC)
|
|
output_buf->codec.h264.pic_type = CEDRUS_H264_PIC_TYPE_FIELD;
|
|
else if (sps->flags & V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD)
|
|
@@ -516,8 +535,6 @@ static int cedrus_h264_start(struct cedrus_ctx *ctx)
|
|
{
|
|
struct cedrus_dev *dev = ctx->dev;
|
|
unsigned int pic_info_size;
|
|
- unsigned int field_size;
|
|
- unsigned int mv_col_size;
|
|
int ret;
|
|
|
|
/*
|
|
@@ -565,38 +582,6 @@ static int cedrus_h264_start(struct cedrus_ctx *ctx)
|
|
goto err_pic_buf;
|
|
}
|
|
|
|
- field_size = DIV_ROUND_UP(ctx->src_fmt.width, 16) *
|
|
- DIV_ROUND_UP(ctx->src_fmt.height, 16) * 16;
|
|
-
|
|
- /*
|
|
- * FIXME: This is actually conditional to
|
|
- * V4L2_H264_SPS_FLAG_DIRECT_8X8_INFERENCE not being set, we
|
|
- * might have to rework this if memory efficiency ever is
|
|
- * something we need to work on.
|
|
- */
|
|
- field_size = field_size * 2;
|
|
-
|
|
- /*
|
|
- * FIXME: This is actually conditional to
|
|
- * V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY not being set, we might
|
|
- * have to rework this if memory efficiency ever is something
|
|
- * we need to work on.
|
|
- */
|
|
- field_size = field_size * 2;
|
|
- ctx->codec.h264.mv_col_buf_field_size = field_size;
|
|
-
|
|
- mv_col_size = field_size * 2 * CEDRUS_H264_FRAME_NUM;
|
|
- ctx->codec.h264.mv_col_buf_size = mv_col_size;
|
|
- ctx->codec.h264.mv_col_buf =
|
|
- dma_alloc_attrs(dev->dev,
|
|
- ctx->codec.h264.mv_col_buf_size,
|
|
- &ctx->codec.h264.mv_col_buf_dma,
|
|
- GFP_KERNEL, DMA_ATTR_NO_KERNEL_MAPPING);
|
|
- if (!ctx->codec.h264.mv_col_buf) {
|
|
- ret = -ENOMEM;
|
|
- goto err_neighbor_buf;
|
|
- }
|
|
-
|
|
if (ctx->src_fmt.width > 2048) {
|
|
/*
|
|
* Formulas for deblock and intra prediction buffer sizes
|
|
@@ -612,7 +597,7 @@ static int cedrus_h264_start(struct cedrus_ctx *ctx)
|
|
GFP_KERNEL, DMA_ATTR_NO_KERNEL_MAPPING);
|
|
if (!ctx->codec.h264.deblk_buf) {
|
|
ret = -ENOMEM;
|
|
- goto err_mv_col_buf;
|
|
+ goto err_neighbor_buf;
|
|
}
|
|
|
|
/*
|
|
@@ -640,12 +625,6 @@ static int cedrus_h264_start(struct cedrus_ctx *ctx)
|
|
ctx->codec.h264.deblk_buf_dma,
|
|
DMA_ATTR_NO_KERNEL_MAPPING);
|
|
|
|
-err_mv_col_buf:
|
|
- dma_free_attrs(dev->dev, ctx->codec.h264.mv_col_buf_size,
|
|
- ctx->codec.h264.mv_col_buf,
|
|
- ctx->codec.h264.mv_col_buf_dma,
|
|
- DMA_ATTR_NO_KERNEL_MAPPING);
|
|
-
|
|
err_neighbor_buf:
|
|
dma_free_attrs(dev->dev, CEDRUS_NEIGHBOR_INFO_BUF_SIZE,
|
|
ctx->codec.h264.neighbor_info_buf,
|
|
@@ -664,10 +643,6 @@ static void cedrus_h264_stop(struct cedrus_ctx *ctx)
|
|
{
|
|
struct cedrus_dev *dev = ctx->dev;
|
|
|
|
- dma_free_attrs(dev->dev, ctx->codec.h264.mv_col_buf_size,
|
|
- ctx->codec.h264.mv_col_buf,
|
|
- ctx->codec.h264.mv_col_buf_dma,
|
|
- DMA_ATTR_NO_KERNEL_MAPPING);
|
|
dma_free_attrs(dev->dev, CEDRUS_NEIGHBOR_INFO_BUF_SIZE,
|
|
ctx->codec.h264.neighbor_info_buf,
|
|
ctx->codec.h264.neighbor_info_buf_dma,
|
|
@@ -696,6 +671,17 @@ static void cedrus_h264_trigger(struct cedrus_ctx *ctx)
|
|
VE_H264_TRIGGER_TYPE_AVC_SLICE_DECODE);
|
|
}
|
|
|
|
+static void cedrus_h264_buf_cleanup(struct cedrus_ctx *ctx,
|
|
+ struct cedrus_buffer *buf)
|
|
+{
|
|
+ if (buf->codec.h264.mv_col_buf_size)
|
|
+ dma_free_attrs(ctx->dev->dev,
|
|
+ buf->codec.h264.mv_col_buf_size,
|
|
+ buf->codec.h264.mv_col_buf,
|
|
+ buf->codec.h264.mv_col_buf_dma,
|
|
+ DMA_ATTR_NO_KERNEL_MAPPING);
|
|
+}
|
|
+
|
|
struct cedrus_dec_ops cedrus_dec_ops_h264 = {
|
|
.irq_clear = cedrus_h264_irq_clear,
|
|
.irq_disable = cedrus_h264_irq_disable,
|
|
@@ -704,4 +690,5 @@ struct cedrus_dec_ops cedrus_dec_ops_h264 = {
|
|
.start = cedrus_h264_start,
|
|
.stop = cedrus_h264_stop,
|
|
.trigger = cedrus_h264_trigger,
|
|
+ .buf_cleanup = cedrus_h264_buf_cleanup,
|
|
};
|
|
--
|
|
2.35.3
|
|
|