Commit 317b4ca4 authored by Kamil Debski's avatar Kamil Debski Committed by Mauro Carvalho Chehab

[media] s5p-mfc: Change internal buffer allocation from vb2 ops to dma_alloc_coherent

Change internal buffer allocation from vb2 memory ops call to direct
calls of dma_alloc_coherent. This change shortens the code and makes it
much more readable.
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ef89fff8
...@@ -496,15 +496,9 @@ struct s5p_mfc_codec_ops { ...@@ -496,15 +496,9 @@ struct s5p_mfc_codec_ops {
* flushed * flushed
* @head_processed: flag mentioning whether the header data is processed * @head_processed: flag mentioning whether the header data is processed
* completely or not * completely or not
* @bank1_buf: handle to memory allocated for temporary buffers from * @bank1: handle to memory allocated for temporary buffers from
* memory bank 1 * memory bank 1
* @bank1_phys: address of the temporary buffers from memory bank 1 * @bank2: handle to memory allocated for temporary buffers from
* @bank1_size: size of the memory allocated for temporary buffers from
* memory bank 1
* @bank2_buf: handle to memory allocated for temporary buffers from
* memory bank 2
* @bank2_phys: address of the temporary buffers from memory bank 2
* @bank2_size: size of the memory allocated for temporary buffers from
* memory bank 2 * memory bank 2
* @capture_state: state of the capture buffers queue * @capture_state: state of the capture buffers queue
* @output_state: state of the output buffers queue * @output_state: state of the output buffers queue
...@@ -584,14 +578,8 @@ struct s5p_mfc_ctx { ...@@ -584,14 +578,8 @@ struct s5p_mfc_ctx {
unsigned int dpb_flush_flag; unsigned int dpb_flush_flag;
unsigned int head_processed; unsigned int head_processed;
/* Buffers */ struct s5p_mfc_priv_buf bank1;
void *bank1_buf; struct s5p_mfc_priv_buf bank2;
size_t bank1_phys;
size_t bank1_size;
void *bank2_buf;
size_t bank2_phys;
size_t bank2_size;
enum s5p_mfc_queue_state capture_state; enum s5p_mfc_queue_state capture_state;
enum s5p_mfc_queue_state output_state; enum s5p_mfc_queue_state output_state;
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include "s5p_mfc_debug.h"
#include "s5p_mfc_opr.h" #include "s5p_mfc_opr.h"
#include "s5p_mfc_opr_v5.h" #include "s5p_mfc_opr_v5.h"
#include "s5p_mfc_opr_v6.h" #include "s5p_mfc_opr_v6.h"
...@@ -29,3 +30,32 @@ void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev) ...@@ -29,3 +30,32 @@ void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev)
} }
dev->mfc_ops = s5p_mfc_ops; dev->mfc_ops = s5p_mfc_ops;
} }
int s5p_mfc_alloc_priv_buf(struct device *dev,
struct s5p_mfc_priv_buf *b)
{
mfc_debug(3, "Allocating priv: %d\n", b->size);
b->virt = dma_alloc_coherent(dev, b->size, &b->dma, GFP_KERNEL);
if (!b->virt) {
mfc_err("Allocating private buffer failed\n");
return -ENOMEM;
}
mfc_debug(3, "Allocated addr %p %08x\n", b->virt, b->dma);
return 0;
}
void s5p_mfc_release_priv_buf(struct device *dev,
struct s5p_mfc_priv_buf *b)
{
if (b->virt) {
dma_free_coherent(dev, b->size, b->virt, b->dma);
b->virt = 0;
b->dma = 0;
b->size = 0;
}
}
...@@ -80,5 +80,10 @@ struct s5p_mfc_hw_ops { ...@@ -80,5 +80,10 @@ struct s5p_mfc_hw_ops {
}; };
void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev); void s5p_mfc_init_hw_ops(struct s5p_mfc_dev *dev);
int s5p_mfc_alloc_priv_buf(struct device *dev,
struct s5p_mfc_priv_buf *b);
void s5p_mfc_release_priv_buf(struct device *dev,
struct s5p_mfc_priv_buf *b);
#endif /* S5P_MFC_OPR_H_ */ #endif /* S5P_MFC_OPR_H_ */
...@@ -73,6 +73,7 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ...@@ -73,6 +73,7 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
{ {
struct s5p_mfc_dev *dev = ctx->dev; struct s5p_mfc_dev *dev = ctx->dev;
unsigned int mb_width, mb_height; unsigned int mb_width, mb_height;
int ret;
mb_width = MB_WIDTH(ctx->img_width); mb_width = MB_WIDTH(ctx->img_width);
mb_height = MB_HEIGHT(ctx->img_height); mb_height = MB_HEIGHT(ctx->img_height);
...@@ -112,7 +113,7 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ...@@ -112,7 +113,7 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
mb_height); mb_height);
ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size, ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size,
S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6); S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6);
ctx->bank1_size = ctx->bank1.size =
ctx->scratch_buf_size + ctx->scratch_buf_size +
(ctx->mv_count * ctx->mv_size); (ctx->mv_count * ctx->mv_size);
break; break;
...@@ -123,7 +124,7 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ...@@ -123,7 +124,7 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
mb_height); mb_height);
ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size, ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size,
S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6); S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6);
ctx->bank1_size = ctx->scratch_buf_size; ctx->bank1.size = ctx->scratch_buf_size;
break; break;
case S5P_MFC_CODEC_VC1RCV_DEC: case S5P_MFC_CODEC_VC1RCV_DEC:
case S5P_MFC_CODEC_VC1_DEC: case S5P_MFC_CODEC_VC1_DEC:
...@@ -133,11 +134,11 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ...@@ -133,11 +134,11 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
mb_height); mb_height);
ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size, ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size,
S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6); S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6);
ctx->bank1_size = ctx->scratch_buf_size; ctx->bank1.size = ctx->scratch_buf_size;
break; break;
case S5P_MFC_CODEC_MPEG2_DEC: case S5P_MFC_CODEC_MPEG2_DEC:
ctx->bank1_size = 0; ctx->bank1.size = 0;
ctx->bank2_size = 0; ctx->bank2.size = 0;
break; break;
case S5P_MFC_CODEC_H263_DEC: case S5P_MFC_CODEC_H263_DEC:
ctx->scratch_buf_size = ctx->scratch_buf_size =
...@@ -146,7 +147,7 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ...@@ -146,7 +147,7 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
mb_height); mb_height);
ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size, ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size,
S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6); S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6);
ctx->bank1_size = ctx->scratch_buf_size; ctx->bank1.size = ctx->scratch_buf_size;
break; break;
case S5P_MFC_CODEC_VP8_DEC: case S5P_MFC_CODEC_VP8_DEC:
ctx->scratch_buf_size = ctx->scratch_buf_size =
...@@ -155,7 +156,7 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ...@@ -155,7 +156,7 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
mb_height); mb_height);
ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size, ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size,
S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6); S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6);
ctx->bank1_size = ctx->scratch_buf_size; ctx->bank1.size = ctx->scratch_buf_size;
break; break;
case S5P_MFC_CODEC_H264_ENC: case S5P_MFC_CODEC_H264_ENC:
ctx->scratch_buf_size = ctx->scratch_buf_size =
...@@ -164,11 +165,11 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ...@@ -164,11 +165,11 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
mb_height); mb_height);
ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size, ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size,
S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6); S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6);
ctx->bank1_size = ctx->bank1.size =
ctx->scratch_buf_size + ctx->tmv_buffer_size + ctx->scratch_buf_size + ctx->tmv_buffer_size +
(ctx->dpb_count * (ctx->luma_dpb_size + (ctx->dpb_count * (ctx->luma_dpb_size +
ctx->chroma_dpb_size + ctx->me_buffer_size)); ctx->chroma_dpb_size + ctx->me_buffer_size));
ctx->bank2_size = 0; ctx->bank2.size = 0;
break; break;
case S5P_MFC_CODEC_MPEG4_ENC: case S5P_MFC_CODEC_MPEG4_ENC:
case S5P_MFC_CODEC_H263_ENC: case S5P_MFC_CODEC_H263_ENC:
...@@ -178,28 +179,24 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ...@@ -178,28 +179,24 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
mb_height); mb_height);
ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size, ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size,
S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6); S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6);
ctx->bank1_size = ctx->bank1.size =
ctx->scratch_buf_size + ctx->tmv_buffer_size + ctx->scratch_buf_size + ctx->tmv_buffer_size +
(ctx->dpb_count * (ctx->luma_dpb_size + (ctx->dpb_count * (ctx->luma_dpb_size +
ctx->chroma_dpb_size + ctx->me_buffer_size)); ctx->chroma_dpb_size + ctx->me_buffer_size));
ctx->bank2_size = 0; ctx->bank2.size = 0;
break; break;
default: default:
break; break;
} }
/* Allocate only if memory from bank 1 is necessary */ /* Allocate only if memory from bank 1 is necessary */
if (ctx->bank1_size > 0) { if (ctx->bank1.size > 0) {
ctx->bank1_buf = vb2_dma_contig_memops.alloc( ret = s5p_mfc_alloc_priv_buf(dev->mem_dev_l, &ctx->bank1);
dev->alloc_ctx[MFC_BANK1_ALLOC_CTX], ctx->bank1_size); if (ret) {
if (IS_ERR(ctx->bank1_buf)) { mfc_err("Failed to allocate Bank1 memory\n");
ctx->bank1_buf = 0; return ret;
pr_err("Buf alloc for decoding failed (port A)\n");
return -ENOMEM;
} }
ctx->bank1_phys = s5p_mfc_mem_cookie( BUG_ON(ctx->bank1.dma & ((1 << MFC_BANK1_ALIGN_ORDER) - 1));
dev->alloc_ctx[MFC_BANK1_ALLOC_CTX], ctx->bank1_buf);
BUG_ON(ctx->bank1_phys & ((1 << MFC_BANK1_ALIGN_ORDER) - 1));
} }
return 0; return 0;
...@@ -208,12 +205,7 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ...@@ -208,12 +205,7 @@ int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
/* Release buffers allocated for codec */ /* Release buffers allocated for codec */
void s5p_mfc_release_codec_buffers_v6(struct s5p_mfc_ctx *ctx) void s5p_mfc_release_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
{ {
if (ctx->bank1_buf) { s5p_mfc_release_priv_buf(ctx->dev->mem_dev_l, &ctx->bank1);
vb2_dma_contig_memops.put(ctx->bank1_buf);
ctx->bank1_buf = 0;
ctx->bank1_phys = 0;
ctx->bank1_size = 0;
}
} }
/* Allocate memory for instance data buffer */ /* Allocate memory for instance data buffer */
...@@ -221,6 +213,7 @@ int s5p_mfc_alloc_instance_buffer_v6(struct s5p_mfc_ctx *ctx) ...@@ -221,6 +213,7 @@ int s5p_mfc_alloc_instance_buffer_v6(struct s5p_mfc_ctx *ctx)
{ {
struct s5p_mfc_dev *dev = ctx->dev; struct s5p_mfc_dev *dev = ctx->dev;
struct s5p_mfc_buf_size_v6 *buf_size = dev->variant->buf_size->priv; struct s5p_mfc_buf_size_v6 *buf_size = dev->variant->buf_size->priv;
int ret;
mfc_debug_enter(); mfc_debug_enter();
...@@ -250,25 +243,10 @@ int s5p_mfc_alloc_instance_buffer_v6(struct s5p_mfc_ctx *ctx) ...@@ -250,25 +243,10 @@ int s5p_mfc_alloc_instance_buffer_v6(struct s5p_mfc_ctx *ctx)
break; break;
} }
ctx->ctx.alloc = vb2_dma_contig_memops.alloc( ret = s5p_mfc_alloc_priv_buf(dev->mem_dev_l, &ctx->ctx);
dev->alloc_ctx[MFC_BANK1_ALLOC_CTX], ctx->ctx.size); if (ret) {
if (IS_ERR(ctx->ctx.alloc)) { mfc_err("Failed to allocate instance buffer\n");
mfc_err("Allocating context buffer failed.\n"); return ret;
return PTR_ERR(ctx->ctx.alloc);
}
ctx->ctx.dma = s5p_mfc_mem_cookie(
dev->alloc_ctx[MFC_BANK1_ALLOC_CTX], ctx->ctx.alloc);
ctx->ctx.virt = vb2_dma_contig_memops.vaddr(ctx->ctx.alloc);
if (!ctx->ctx.virt) {
vb2_dma_contig_memops.put(ctx->ctx.alloc);
ctx->ctx.alloc = NULL;
ctx->ctx.dma = 0;
ctx->ctx.virt = NULL;
mfc_err("Remapping context buffer failed.\n");
return -ENOMEM;
} }
memset(ctx->ctx.virt, 0, ctx->ctx.size); memset(ctx->ctx.virt, 0, ctx->ctx.size);
...@@ -282,44 +260,22 @@ int s5p_mfc_alloc_instance_buffer_v6(struct s5p_mfc_ctx *ctx) ...@@ -282,44 +260,22 @@ int s5p_mfc_alloc_instance_buffer_v6(struct s5p_mfc_ctx *ctx)
/* Release instance buffer */ /* Release instance buffer */
void s5p_mfc_release_instance_buffer_v6(struct s5p_mfc_ctx *ctx) void s5p_mfc_release_instance_buffer_v6(struct s5p_mfc_ctx *ctx)
{ {
mfc_debug_enter(); s5p_mfc_release_priv_buf(ctx->dev->mem_dev_l, &ctx->ctx);
if (ctx->ctx.alloc) {
vb2_dma_contig_memops.put(ctx->ctx.alloc);
ctx->ctx.alloc = NULL;
ctx->ctx.dma = 0;
ctx->ctx.virt = NULL;
}
mfc_debug_leave();
} }
/* Allocate context buffers for SYS_INIT */ /* Allocate context buffers for SYS_INIT */
int s5p_mfc_alloc_dev_context_buffer_v6(struct s5p_mfc_dev *dev) int s5p_mfc_alloc_dev_context_buffer_v6(struct s5p_mfc_dev *dev)
{ {
struct s5p_mfc_buf_size_v6 *buf_size = dev->variant->buf_size->priv; struct s5p_mfc_buf_size_v6 *buf_size = dev->variant->buf_size->priv;
int ret;
mfc_debug_enter(); mfc_debug_enter();
dev->ctx_buf.alloc = vb2_dma_contig_memops.alloc( dev->ctx_buf.size = buf_size->dev_ctx;
dev->alloc_ctx[MFC_BANK1_ALLOC_CTX], buf_size->dev_ctx); ret = s5p_mfc_alloc_priv_buf(dev->mem_dev_l, &dev->ctx_buf);
if (IS_ERR(dev->ctx_buf.alloc)) { if (ret) {
mfc_err("Allocating DESC buffer failed.\n"); mfc_err("Failed to allocate device context buffer\n");
return PTR_ERR(dev->ctx_buf.alloc); return ret;
}
dev->ctx_buf.dma = s5p_mfc_mem_cookie(
dev->alloc_ctx[MFC_BANK1_ALLOC_CTX],
dev->ctx_buf.alloc);
dev->ctx_buf.virt = vb2_dma_contig_memops.vaddr(dev->ctx_buf.alloc);
if (!dev->ctx_buf.virt) {
vb2_dma_contig_memops.put(dev->ctx_buf.alloc);
dev->ctx_buf.alloc = NULL;
dev->ctx_buf.dma = 0;
mfc_err("Remapping DESC buffer failed.\n");
return -ENOMEM;
} }
memset(dev->ctx_buf.virt, 0, buf_size->dev_ctx); memset(dev->ctx_buf.virt, 0, buf_size->dev_ctx);
...@@ -333,12 +289,7 @@ int s5p_mfc_alloc_dev_context_buffer_v6(struct s5p_mfc_dev *dev) ...@@ -333,12 +289,7 @@ int s5p_mfc_alloc_dev_context_buffer_v6(struct s5p_mfc_dev *dev)
/* Release context buffers for SYS_INIT */ /* Release context buffers for SYS_INIT */
void s5p_mfc_release_dev_context_buffer_v6(struct s5p_mfc_dev *dev) void s5p_mfc_release_dev_context_buffer_v6(struct s5p_mfc_dev *dev)
{ {
if (dev->ctx_buf.alloc) { s5p_mfc_release_priv_buf(dev->mem_dev_l, &dev->ctx_buf);
vb2_dma_contig_memops.put(dev->ctx_buf.alloc);
dev->ctx_buf.alloc = NULL;
dev->ctx_buf.dma = 0;
dev->ctx_buf.virt = NULL;
}
} }
static int calc_plane(int width, int height) static int calc_plane(int width, int height)
...@@ -417,8 +368,8 @@ int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx) ...@@ -417,8 +368,8 @@ int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx)
int buf_size1; int buf_size1;
int align_gap; int align_gap;
buf_addr1 = ctx->bank1_phys; buf_addr1 = ctx->bank1.dma;
buf_size1 = ctx->bank1_size; buf_size1 = ctx->bank1.size;
mfc_debug(2, "Buf1: %p (%d)\n", (void *)buf_addr1, buf_size1); mfc_debug(2, "Buf1: %p (%d)\n", (void *)buf_addr1, buf_size1);
mfc_debug(2, "Total DPB COUNT: %d\n", ctx->total_dpb_count); mfc_debug(2, "Total DPB COUNT: %d\n", ctx->total_dpb_count);
...@@ -540,8 +491,8 @@ int s5p_mfc_set_enc_ref_buffer_v6(struct s5p_mfc_ctx *ctx) ...@@ -540,8 +491,8 @@ int s5p_mfc_set_enc_ref_buffer_v6(struct s5p_mfc_ctx *ctx)
mfc_debug_enter(); mfc_debug_enter();
buf_addr1 = ctx->bank1_phys; buf_addr1 = ctx->bank1.dma;
buf_size1 = ctx->bank1_size; buf_size1 = ctx->bank1.size;
mfc_debug(2, "Buf1: %p (%d)\n", (void *)buf_addr1, buf_size1); mfc_debug(2, "Buf1: %p (%d)\n", (void *)buf_addr1, buf_size1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment