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

fix rga 2 compile bug

Browse Source
This commit is contained in:
zsq
2014-06-05 19:10:15 +08:00
parent 6732533e8b
commit 0b7a7ff4c8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/rockchip/rga2/rga2.h
View File

@@ -449,12 +449,10 @@ struct rga2_req
u8 rgb2yuv_mode;
#if defined(CONFIG_ROCKCHIP_IOMMU) & defined(CONFIG_ION_ROCKCHIP)
struct sg_table *sg_src0;
struct sg_table *sg_src1;
struct sg_table *sg_dst;
struct sg_table *sg_els;
#endif
};
struct rga2_mmu_buf_t {

6
drivers/video/rockchip/rga2/rga2_drv.c
View File

@@ -545,7 +545,6 @@ static void rga2_try_set_reg(void)
rga2_power_on();
udelay(1);
//mdelay(500);
rga2_copy_reg(reg, 0);
rga2_reg_from_wait_to_run(reg);
@@ -688,10 +687,13 @@ static int rga2_convert_dma_buf(struct rga2_req *req)
ion_phys_addr_t phy_addr;
size_t len;
int ret;
#ifdef CONFIG_RGA_IOMMU
req->sg_src0 = NULL;
req->sg_src1 = NULL;
req->sg_dst = NULL;
req->sg_els = NULL;
#endif
if(req->src.yrgb_addr) {
hdl = ion_import_dma_buf(rga2_drvdata->ion_client, req->src.yrgb_addr);
@@ -782,7 +784,7 @@ static int rga2_convert_dma_buf(struct rga2_req *req)
req->src1.v_addr = req->dst.uv_addr + (req->dst.vir_w * req->dst.vir_h)/4;
}
#else
ion_phys(rga2_drvdata->ion_client, hdl, &phy_addr, &len);
ion_phys(rga2_drvdata->ion_client, hdl, &phy_addr, &len);
req->src1.yrgb_addr = phy_addr;
req->src1.uv_addr = req->dst.yrgb_addr + (req->dst.vir_w * req->dst.vir_h);
req->src1.v_addr = req->dst.uv_addr + (req->dst.vir_w * req->dst.vir_h)/4;