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

ge2d: add custom stride support [1/1]

Browse Source 
PD#SWPL-29770

Problem:
accept customized picture stride

Solution:
add this support

Verify:
w400

Change-Id: I582286f0f19a617b728cc262f1616a8fce6091b2
Signed-off-by: Cao Jian <jian.cao@amlogic.com>
Signed-off-by: chunlong.cao <chunlong.cao@amlogic.com>
This commit is contained in:
Cao Jian
2020-07-23 15:28:14 +08:00
committed by Chris
parent 7e699a3907
commit 77e2034375
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/amlogic/media/common/ge2d/ge2d_wq.c
View File

@@ -1075,6 +1075,7 @@ static int build_ge2d_addr_config_dma(
unsigned int format,
unsigned int *addr,
unsigned int *stride,
unsigned int *stride_custom,
unsigned int dir,
unsigned int data_type
)
@@ -1123,7 +1124,11 @@ static int build_ge2d_addr_config_dma(
if (plane[0].addr) {
*addr = plane[0].addr;
*stride = plane[0].w * bpp_value;
if (format & GE2D_STRIDE_CUSTOM)
*stride = stride_custom[0];
else
*stride = plane[0].w * bpp_value;
ret = 0;
}
/* not support multi-src_planes */
@@ -1218,6 +1223,7 @@ static int build_ge2d_config_ex_ion(struct ge2d_context_s *context,
static int build_ge2d_config_ex_dma(struct ge2d_context_s *context,
struct config_planes_ion_s *plane,
unsigned int format,
unsigned int *stride_custom,
unsigned int dir,
unsigned int data_type)
{
@@ -1226,6 +1232,7 @@ static int build_ge2d_config_ex_dma(struct ge2d_context_s *context,
int ret = -1, i;
int canvas_set = 0;
unsigned long addr;
unsigned int stride;
bpp_value /= 8;
if (plane) {
@@ -1280,9 +1287,15 @@ static int build_ge2d_config_ex_dma(struct ge2d_context_s *context,
data_type, i);
if (!canvas_cfg)
return -1;
if (format & GE2D_STRIDE_CUSTOM)
stride = stride_custom[i];
else
stride = plane[i].w * bpp_value;
update_canvas_cfg(canvas_cfg,
plane[i].addr,
plane[i].w * bpp_value,
stride,
plane[i].h);
canvas_set = 0;
}
@@ -2090,6 +2103,8 @@ int ge2d_context_config_ex_mem(struct ge2d_context_s *context,
ge2d_log_dbg("ge2d error: src alloc, out of range\n");
return -1;
}
stride_custom = ge2d_config_mem->stride_custom.src1_stride;
if (ge2d_meson_dev.canvas_status == 1) {
if (build_ge2d_addr_config_dma(
context,
@@ -2097,6 +2112,7 @@ int ge2d_context_config_ex_mem(struct ge2d_context_s *context,
ge2d_config->src_para.format,
&src_addr,
&src_stride,
stride_custom,
DMA_TO_DEVICE,
AML_GE2D_SRC) < 0)
return -1;
@@ -2109,6 +2125,7 @@ int ge2d_context_config_ex_mem(struct ge2d_context_s *context,
context,
&ge2d_config->src_planes[0],
ge2d_config->src_para.format,
stride_custom,
DMA_TO_DEVICE,
AML_GE2D_SRC) < 0)
return -1;
@@ -2168,6 +2185,7 @@ int ge2d_context_config_ex_mem(struct ge2d_context_s *context,
* index = ge2d_config->src_para.canvas_index;
* else
*/
stride_custom = ge2d_config_mem->stride_custom.src2_stride;
if (ge2d_meson_dev.canvas_status == 1) {
if (build_ge2d_addr_config_dma(
context,
@@ -2175,6 +2193,7 @@ int ge2d_context_config_ex_mem(struct ge2d_context_s *context,
ge2d_config->src2_para.format,
&src2_addr,
&src2_stride,
stride_custom,
DMA_TO_DEVICE,
AML_GE2D_SRC2) < 0)
return -1;
@@ -2187,6 +2206,7 @@ int ge2d_context_config_ex_mem(struct ge2d_context_s *context,
context,
&ge2d_config->src2_planes[0],
ge2d_config->src2_para.format,
stride_custom,
DMA_TO_DEVICE,
AML_GE2D_SRC2) < 0)
return -1;
@@ -2249,6 +2269,7 @@ int ge2d_context_config_ex_mem(struct ge2d_context_s *context,
* index = ge2d_config->src2_para.canvas_index;
* else
*/
stride_custom = ge2d_config_mem->stride_custom.dst_stride;
if (ge2d_meson_dev.canvas_status == 1) {
if (build_ge2d_addr_config_dma(
context,
@@ -2256,6 +2277,7 @@ int ge2d_context_config_ex_mem(struct ge2d_context_s *context,
ge2d_config->dst_para.format,
&dst_addr,
&dst_stride,
stride_custom,
DMA_FROM_DEVICE,
AML_GE2D_DST) < 0)
return -1;
@@ -2268,6 +2290,7 @@ int ge2d_context_config_ex_mem(struct ge2d_context_s *context,
context,
&ge2d_config->dst_planes[0],
ge2d_config->dst_para.format,
stride_custom,
DMA_FROM_DEVICE,
AML_GE2D_DST) < 0)
return -1;

12
include/linux/amlogic/media/ge2d/ge2d.h
View File

@@ -143,11 +143,13 @@ enum ge2d_memtype_s {
#define MATRIX_BT_601 (0 << 4)
#define MATRIX_BT_709 (1 << 4)
#define MATRIX_CUSTOM BIT(5)
#define STRIDE_CUSTOM BIT(6)
#define GE2D_FORMAT_BT_STANDARD (1 << 28)
#define GE2D_FORMAT_BT601 (0 << 28)
#define GE2D_FORMAT_BT709 (1 << 28)
#define GE2D_MATRIX_CUSTOM BIT(29)
#define GE2D_STRIDE_CUSTOM BIT(30)
#define GE2D_ENDIAN_SHIFT 24
#define GE2D_ENDIAN_MASK (0x1 << GE2D_ENDIAN_SHIFT)
@@ -672,6 +674,12 @@ struct ge2d_matrix_s {
unsigned char sat_in_en;
};
struct ge2d_stride_s {
unsigned int src1_stride[MAX_PLANE];
unsigned int src2_stride[MAX_PLANE];
unsigned int dst_stride[MAX_PLANE];
};
struct ge2d_config_s {
struct ge2d_gen_s gen;
struct ge2d_src1_data_s src1_data;
@@ -1063,6 +1071,8 @@ struct config_para_ex_memtype_s {
unsigned int dst_mem_alloc_type;
/* for customized matrix */
struct ge2d_matrix_s matrix_custom;
/* for customized stride */
struct ge2d_stride_s stride_custom;
};
struct config_ge2d_para_ex_s {
@@ -1083,6 +1093,8 @@ struct compat_config_para_ex_memtype_s {
unsigned int dst_mem_alloc_type;
/* for customized matrix */
struct ge2d_matrix_s matrix_custom;
/* for customized stride */
struct ge2d_stride_s stride_custom;
};
struct compat_config_ge2d_para_ex_s {