video: rockchip: rkvdec: add drm&ion allocator support

Now vpu driver support both drm and ion allocator. And have
test on rk3399-mid(drm android 7.1), rk3399-mid(ion android
6.0), rk3288(linux mini arm) platform.

Change-Id: I0096c3928849b1f11a62378675f4559b4f101445
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Randy Li <randy.li@rock-chips.com>
This commit is contained in:
Randy Li
2016-10-31 16:58:28 +08:00
committed by Huang, Tao
parent 674ed815cc
commit f14530d44c
10 changed files with 1640 additions and 402 deletions

View File

@@ -1,2 +1,11 @@
rk-vcodec-objs := vcodec_service.o
rk-vcodec-objs := vcodec_service.o vcodec_iommu_ops.o
ifdef CONFIG_DRM
rk-vcodec-objs += vcodec_iommu_drm.o
endif
ifdef CONFIG_ION
rk-vcodec-objs += vcodec_iommu_ion.o
endif
obj-$(CONFIG_RK_VCODEC) += rk-vcodec.o

View File

@@ -46,12 +46,13 @@ enum VPU_HW_ID {
*
* These three type features composite a complete codec information structure
*/
enum HW_TYPE {
HW_VPU,
HW_VPU2,
HW_RKV,
HW_TYPE_BUTT,
};
/* VPU1 and VPU2 */
#define VCODEC_DEVICE_TYPE_VPUX 0x56505558
/* VPU Combo */
#define VCODEC_DEVICE_TYPE_VPUC 0x56505543
#define VCODEC_DEVICE_TYPE_HEVC 0x56505532
#define VCODEC_DEVICE_TYPE_RKVD 0x524B5644
enum TASK_TYPE {
TASK_ENC,
@@ -128,6 +129,12 @@ struct vpu_task_info {
struct timeval start;
struct timeval end;
/*
* input stream register
* use for map/unmap drm buffer for avoiding
* cache sync issue
*/
int reg_rlc;
/*
* task enable register
* use for enable hardware task process
@@ -207,6 +214,11 @@ struct vcodec_info {
const struct vpu_trans_info *trans_info;
};
struct vcodec_device_info {
int32_t device_type;
int8_t *name;
};
#define DEF_FMT_TRANS_TBL(fmt, args...) \
static const char trans_tbl_##fmt[] = { \
args \

View File

@@ -91,6 +91,7 @@ static struct vpu_task_info task_rkv[TASK_TYPE_BUTT] = {
},
{
.name = "rkvdec",
.reg_rlc = 4,
.reg_en = RKV_REG_EN_DEC,
.reg_irq = RKV_DEC_INTERRUPT_REGISTER,
.reg_len = 4,

View File

@@ -127,6 +127,7 @@ static enum FORMAT_TYPE vpu_enc_get_fmt(u32 *regs)
static struct vpu_task_info task_vpu[TASK_TYPE_BUTT] = {
{
.name = "vpu_enc",
.reg_rlc = 11,
.reg_en = VPU_REG_EN_ENC,
.reg_irq = VPU_ENC_INTERRUPT_REGISTER,
.reg_len = -1,
@@ -143,6 +144,7 @@ static struct vpu_task_info task_vpu[TASK_TYPE_BUTT] = {
},
{
.name = "vpu_dec",
.reg_rlc = 12,
.reg_en = VPU_REG_EN_DEC,
.reg_irq = VPU_DEC_INTERRUPT_REGISTER,
.reg_len = 12,

View File

@@ -124,6 +124,7 @@ static enum FORMAT_TYPE vpu2_enc_get_fmt(u32 *regs)
static struct vpu_task_info task_vpu2[TASK_TYPE_BUTT] = {
{
.name = "vpu2_enc",
.reg_rlc = 48,
.reg_en = VPU2_REG_EN_ENC,
.reg_gating = VPU2_REG_ENC_GATE,
.reg_irq = VPU2_ENC_INTERRUPT_REGISTER,
@@ -141,6 +142,7 @@ static struct vpu_task_info task_vpu2[TASK_TYPE_BUTT] = {
},
{
.name = "vpu2_dec",
.reg_rlc = 64,
.reg_en = VPU2_REG_EN_DEC,
.reg_irq = VPU2_DEC_INTERRUPT_REGISTER,
.reg_len = 64,

View File

@@ -0,0 +1,576 @@
/*
* Copyright (C) 2016 Fuzhou Rockchip Electronics Co., Ltd
* author: Jung Zhao jung.zhao@rock-chips.com
* Randy Li, randy.li@rock-chips.com
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
* may be copied, distributed, and modified under those terms.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include <linux/dma-iommu.h>
#include <linux/dma-buf.h>
#include <drm/drmP.h>
#include <drm/drm_atomic.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_sync_helper.h>
#include <drm/rockchip_drm.h>
#include <linux/dma-mapping.h>
#include <linux/rockchip-iovmm.h>
#include <linux/pm_runtime.h>
#include <linux/memblock.h>
#include <linux/module.h>
#include <linux/of_address.h>
#include <linux/of_graph.h>
#include <linux/component.h>
#include <linux/fence.h>
#include <linux/console.h>
#include <linux/kref.h>
#include <linux/fdtable.h>
#include "vcodec_iommu_ops.h"
struct vcodec_drm_buffer {
struct list_head list;
struct dma_buf *dma_buf;
union {
unsigned long iova;
unsigned long phys;
};
void *cpu_addr;
unsigned long size;
int fd;
int index;
struct dma_buf_attachment *attach;
struct sg_table *sgt;
struct page **pages;
struct kref ref;
struct vcodec_iommu_session_info *session_info;
};
struct vcodec_iommu_drm_info {
struct iommu_domain *domain;
bool attached;
};
static struct vcodec_drm_buffer *
vcodec_drm_get_buffer_no_lock(struct vcodec_iommu_session_info *session_info,
int idx)
{
struct vcodec_drm_buffer *drm_buffer = NULL, *n;
list_for_each_entry_safe(drm_buffer, n, &session_info->buffer_list,
list) {
if (drm_buffer->index == idx)
return drm_buffer;
}
return NULL;
}
static struct vcodec_drm_buffer *
vcodec_drm_get_buffer_fd_no_lock(struct vcodec_iommu_session_info *session_info,
int fd)
{
struct vcodec_drm_buffer *drm_buffer = NULL, *n;
list_for_each_entry_safe(drm_buffer, n, &session_info->buffer_list,
list) {
if (drm_buffer->fd == fd)
return drm_buffer;
}
return NULL;
}
static void vcodec_drm_detach(struct vcodec_iommu_info *iommu_info)
{
struct vcodec_iommu_drm_info *drm_info = iommu_info->private;
struct device *dev = iommu_info->dev;
struct iommu_domain *domain = drm_info->domain;
mutex_lock(&iommu_info->iommu_mutex);
if (!drm_info->attached) {
mutex_unlock(&iommu_info->iommu_mutex);
return;
}
iommu_detach_device(domain, dev);
drm_info->attached = false;
mutex_unlock(&iommu_info->iommu_mutex);
}
static int vcodec_drm_attach_unlock(struct vcodec_iommu_info *iommu_info)
{
struct vcodec_iommu_drm_info *drm_info = iommu_info->private;
struct device *dev = iommu_info->dev;
struct iommu_domain *domain = drm_info->domain;
int ret = 0;
ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
if (ret)
return ret;
dma_set_max_seg_size(dev, DMA_BIT_MASK(32));
ret = iommu_attach_device(domain, dev);
if (ret) {
dev_err(dev, "Failed to attach iommu device\n");
return ret;
}
if (!common_iommu_setup_dma_ops(dev, 0x10000000, SZ_2G, domain->ops)) {
dev_err(dev, "Failed to set dma_ops\n");
iommu_detach_device(domain, dev);
ret = -ENODEV;
}
return ret;
}
static int vcodec_drm_attach(struct vcodec_iommu_info *iommu_info)
{
struct vcodec_iommu_drm_info *drm_info = iommu_info->private;
int ret;
mutex_lock(&iommu_info->iommu_mutex);
if (drm_info->attached) {
mutex_unlock(&iommu_info->iommu_mutex);
return 0;
}
ret = vcodec_drm_attach_unlock(iommu_info);
if (ret) {
mutex_unlock(&iommu_info->iommu_mutex);
return ret;
}
drm_info->attached = true;
mutex_unlock(&iommu_info->iommu_mutex);
return ret;
}
static void *vcodec_drm_sgt_map_kernel(struct vcodec_drm_buffer *drm_buffer)
{
struct vcodec_iommu_session_info *session_info =
drm_buffer->session_info;
struct device *dev = session_info->dev;
struct scatterlist *sgl, *sg;
int nr_pages = PAGE_ALIGN(drm_buffer->size) >> PAGE_SHIFT;
int i = 0, j = 0, k = 0;
struct page *page;
drm_buffer->pages = kmalloc_array(nr_pages, sizeof(*drm_buffer->pages),
GFP_KERNEL);
if (!(drm_buffer->pages)) {
dev_err(dev, "drm map can not alloc pages\n");
return NULL;
}
sgl = drm_buffer->sgt->sgl;
for_each_sg(sgl, sg, drm_buffer->sgt->nents, i) {
page = sg_page(sg);
for (j = 0; j < sg->length / PAGE_SIZE; j++)
drm_buffer->pages[k++] = page++;
}
return vmap(drm_buffer->pages, nr_pages, VM_MAP,
pgprot_noncached(PAGE_KERNEL));
}
static void vcodec_drm_sgt_unmap_kernel(struct vcodec_drm_buffer *drm_buffer)
{
vunmap(drm_buffer->cpu_addr);
kfree(drm_buffer->pages);
}
static void vcodec_drm_clear_map(struct kref *ref)
{
struct vcodec_drm_buffer *drm_buffer =
container_of(ref, struct vcodec_drm_buffer, ref);
struct vcodec_iommu_session_info *session_info =
drm_buffer->session_info;
struct vcodec_iommu_info *iommu_info = session_info->iommu_info;
struct vcodec_iommu_drm_info *drm_info = iommu_info->private;
struct device *dev = session_info->dev;
struct iommu_domain *domain = drm_info->domain;
mutex_lock(&iommu_info->iommu_mutex);
drm_info = session_info->iommu_info->private;
if (!drm_info->attached) {
if (vcodec_drm_attach_unlock(session_info->iommu_info))
dev_err(dev, "can't clea map, attach iommu failed.\n");
}
if (drm_buffer->cpu_addr) {
vcodec_drm_sgt_unmap_kernel(drm_buffer);
drm_buffer->cpu_addr = NULL;
}
if (drm_buffer->attach) {
dma_buf_unmap_attachment(drm_buffer->attach, drm_buffer->sgt,
DMA_BIDIRECTIONAL);
dma_buf_detach(drm_buffer->dma_buf, drm_buffer->attach);
dma_buf_put(drm_buffer->dma_buf);
drm_buffer->attach = NULL;
}
if (!drm_info->attached)
iommu_detach_device(domain, dev);
mutex_unlock(&iommu_info->iommu_mutex);
}
static void vcdoec_drm_dump_info(struct vcodec_iommu_session_info *session_info)
{
struct vcodec_drm_buffer *drm_buffer = NULL, *n;
vpu_iommu_debug(session_info->debug_level, DEBUG_IOMMU_OPS_DUMP,
"still there are below buffers stored in list\n");
list_for_each_entry_safe(drm_buffer, n, &session_info->buffer_list,
list) {
vpu_iommu_debug(session_info->debug_level, DEBUG_IOMMU_OPS_DUMP,
"index %d drm_buffer fd %d cpu_addr %p\n",
drm_buffer->index,
drm_buffer->fd, drm_buffer->cpu_addr);
}
}
static int vcodec_drm_free(struct vcodec_iommu_session_info *session_info,
int idx)
{
struct device *dev = session_info->dev;
/* please double-check all maps have been release */
struct vcodec_drm_buffer *drm_buffer;
mutex_lock(&session_info->list_mutex);
drm_buffer = vcodec_drm_get_buffer_no_lock(session_info, idx);
if (!drm_buffer) {
dev_err(dev, "can not find %d buffer in list\n", idx);
mutex_unlock(&session_info->list_mutex);
return -EINVAL;
}
if (atomic_read(&drm_buffer->ref.refcount) == 0) {
dma_buf_put(drm_buffer->dma_buf);
list_del_init(&drm_buffer->list);
kfree(drm_buffer);
}
mutex_unlock(&session_info->list_mutex);
return 0;
}
static int
vcodec_drm_unmap_iommu(struct vcodec_iommu_session_info *session_info,
int idx)
{
struct device *dev = session_info->dev;
struct vcodec_drm_buffer *drm_buffer;
/* Force to flush iommu table */
if (of_machine_is_compatible("rockchip,rk3288"))
rockchip_iovmm_invalidate_tlb(session_info->mmu_dev);
mutex_lock(&session_info->list_mutex);
drm_buffer = vcodec_drm_get_buffer_no_lock(session_info, idx);
mutex_unlock(&session_info->list_mutex);
if (!drm_buffer) {
dev_err(dev, "can not find %d buffer in list\n", idx);
return -EINVAL;
}
kref_put(&drm_buffer->ref, vcodec_drm_clear_map);
return 0;
}
static int vcodec_drm_map_iommu(struct vcodec_iommu_session_info *session_info,
int idx,
unsigned long *iova,
unsigned long *size)
{
struct device *dev = session_info->dev;
struct vcodec_drm_buffer *drm_buffer;
/* Force to flush iommu table */
if (of_machine_is_compatible("rockchip,rk3288"))
rockchip_iovmm_invalidate_tlb(session_info->mmu_dev);
mutex_lock(&session_info->list_mutex);
drm_buffer = vcodec_drm_get_buffer_no_lock(session_info, idx);
mutex_unlock(&session_info->list_mutex);
if (!drm_buffer) {
dev_err(dev, "can not find %d buffer in list\n", idx);
return -EINVAL;
}
kref_get(&drm_buffer->ref);
if (iova)
*iova = drm_buffer->iova;
if (size)
*size = drm_buffer->size;
return 0;
}
static int
vcodec_drm_unmap_kernel(struct vcodec_iommu_session_info *session_info, int idx)
{
struct device *dev = session_info->dev;
struct vcodec_drm_buffer *drm_buffer;
mutex_lock(&session_info->list_mutex);
drm_buffer = vcodec_drm_get_buffer_no_lock(session_info, idx);
mutex_unlock(&session_info->list_mutex);
if (!drm_buffer) {
dev_err(dev, "can not find %d buffer in list\n", idx);
return -EINVAL;
}
if (drm_buffer->cpu_addr) {
vcodec_drm_sgt_unmap_kernel(drm_buffer);
drm_buffer->cpu_addr = NULL;
}
kref_put(&drm_buffer->ref, vcodec_drm_clear_map);
return 0;
}
static int
vcodec_drm_free_fd(struct vcodec_iommu_session_info *session_info, int fd)
{
struct device *dev = session_info->dev;
/* please double-check all maps have been release */
struct vcodec_drm_buffer *drm_buffer = NULL;
mutex_lock(&session_info->list_mutex);
drm_buffer = vcodec_drm_get_buffer_fd_no_lock(session_info, fd);
if (!drm_buffer) {
dev_err(dev, "can not find %d buffer in list\n", fd);
mutex_unlock(&session_info->list_mutex);
return -EINVAL;
}
mutex_unlock(&session_info->list_mutex);
vcodec_drm_unmap_iommu(session_info, drm_buffer->index);
mutex_lock(&session_info->list_mutex);
if (atomic_read(&drm_buffer->ref.refcount) == 0) {
dma_buf_put(drm_buffer->dma_buf);
list_del_init(&drm_buffer->list);
kfree(drm_buffer);
}
mutex_unlock(&session_info->list_mutex);
return 0;
}
static void
vcodec_drm_clear_session(struct vcodec_iommu_session_info *session_info)
{
struct vcodec_drm_buffer *drm_buffer = NULL, *n;
list_for_each_entry_safe(drm_buffer, n, &session_info->buffer_list,
list) {
kref_put(&drm_buffer->ref, vcodec_drm_clear_map);
vcodec_drm_free(session_info, drm_buffer->index);
}
}
static void *
vcodec_drm_map_kernel(struct vcodec_iommu_session_info *session_info, int idx)
{
struct device *dev = session_info->dev;
struct vcodec_drm_buffer *drm_buffer;
mutex_lock(&session_info->list_mutex);
drm_buffer = vcodec_drm_get_buffer_no_lock(session_info, idx);
mutex_unlock(&session_info->list_mutex);
if (!drm_buffer) {
dev_err(dev, "can not find %d buffer in list\n", idx);
return NULL;
}
if (!drm_buffer->cpu_addr)
drm_buffer->cpu_addr =
vcodec_drm_sgt_map_kernel(drm_buffer);
kref_get(&drm_buffer->ref);
return drm_buffer->cpu_addr;
}
static int vcodec_drm_import(struct vcodec_iommu_session_info *session_info,
int fd)
{
struct vcodec_drm_buffer *drm_buffer = NULL, *n;
struct vcodec_iommu_info *iommu_info = session_info->iommu_info;
struct vcodec_iommu_drm_info *drm_info = iommu_info->private;
struct device *dev = session_info->dev;
struct dma_buf_attachment *attach;
struct sg_table *sgt;
int ret = 0;
list_for_each_entry_safe(drm_buffer, n,
&session_info->buffer_list, list) {
if (drm_buffer->fd == fd)
return drm_buffer->index;
}
drm_buffer = kzalloc(sizeof(*drm_buffer), GFP_KERNEL);
if (!drm_buffer) {
ret = -ENOMEM;
return ret;
}
drm_buffer->dma_buf = dma_buf_get(fd);
if (IS_ERR(drm_buffer->dma_buf)) {
ret = PTR_ERR(drm_buffer->dma_buf);
kfree(drm_buffer);
return ret;
}
drm_buffer->fd = fd;
drm_buffer->session_info = session_info;
kref_init(&drm_buffer->ref);
mutex_lock(&iommu_info->iommu_mutex);
drm_info = session_info->iommu_info->private;
if (!drm_info->attached) {
ret = vcodec_drm_attach_unlock(session_info->iommu_info);
if (ret)
goto fail_out;
}
attach = dma_buf_attach(drm_buffer->dma_buf, dev);
if (IS_ERR(attach)) {
ret = PTR_ERR(attach);
goto fail_out;
}
get_dma_buf(drm_buffer->dma_buf);
sgt = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL);
if (IS_ERR(sgt)) {
ret = PTR_ERR(sgt);
goto fail_detach;
}
drm_buffer->iova = sg_dma_address(sgt->sgl);
drm_buffer->size = drm_buffer->dma_buf->size;
drm_buffer->attach = attach;
drm_buffer->sgt = sgt;
mutex_unlock(&iommu_info->iommu_mutex);
INIT_LIST_HEAD(&drm_buffer->list);
mutex_lock(&session_info->list_mutex);
drm_buffer->index = session_info->max_idx;
list_add_tail(&drm_buffer->list, &session_info->buffer_list);
session_info->max_idx++;
if ((session_info->max_idx & 0xfffffff) == 0)
session_info->max_idx = 0;
mutex_unlock(&session_info->list_mutex);
return drm_buffer->index;
fail_detach:
dev_err(dev, "dmabuf map attach failed\n");
dma_buf_detach(drm_buffer->dma_buf, attach);
dma_buf_put(drm_buffer->dma_buf);
fail_out:
kfree(drm_buffer);
mutex_unlock(&iommu_info->iommu_mutex);
return ret;
}
static int vcodec_drm_create(struct vcodec_iommu_info *iommu_info)
{
struct vcodec_iommu_drm_info *drm_info;
int ret;
iommu_info->private = kzalloc(sizeof(*drm_info),
GFP_KERNEL);
drm_info = iommu_info->private;
if (!drm_info)
return -ENOMEM;
drm_info->domain = iommu_domain_alloc(&platform_bus_type);
drm_info->attached = false;
if (!drm_info->domain)
return -ENOMEM;
ret = iommu_get_dma_cookie(drm_info->domain);
if (ret)
goto err_free_domain;
vcodec_drm_attach(iommu_info);
return 0;
err_free_domain:
iommu_domain_free(drm_info->domain);
return ret;
}
static int vcodec_drm_destroy(struct vcodec_iommu_info *iommu_info)
{
struct vcodec_iommu_drm_info *drm_info = iommu_info->private;
vcodec_drm_detach(iommu_info);
iommu_put_dma_cookie(drm_info->domain);
iommu_domain_free(drm_info->domain);
kfree(drm_info);
iommu_info->private = NULL;
return 0;
}
static struct vcodec_iommu_ops drm_ops = {
.create = vcodec_drm_create,
.import = vcodec_drm_import,
.free = vcodec_drm_free,
.free_fd = vcodec_drm_free_fd,
.map_kernel = vcodec_drm_map_kernel,
.unmap_kernel = vcodec_drm_unmap_kernel,
.map_iommu = vcodec_drm_map_iommu,
.unmap_iommu = vcodec_drm_unmap_iommu,
.destroy = vcodec_drm_destroy,
.dump = vcdoec_drm_dump_info,
.attach = vcodec_drm_attach,
.detach = vcodec_drm_detach,
.clear = vcodec_drm_clear_session,
};
void vcodec_iommu_drm_set_ops(struct vcodec_iommu_info *iommu_info)
{
if (!iommu_info)
return;
iommu_info->ops = &drm_ops;
}

View File

@@ -0,0 +1,302 @@
/*
* Copyright (C) 2016 Fuzhou Rockchip Electronics Co., Ltd
* author: Jung Zhao jung.zhao@rock-chips.com
* Randy Li, randy.li@rock-chips.com
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
* may be copied, distributed, and modified under those terms.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include <linux/rockchip_ion.h>
#include <linux/rockchip-iovmm.h>
#include <linux/slab.h>
#include <linux/pm_runtime.h>
#include <linux/memblock.h>
#include <linux/module.h>
#include <linux/of_address.h>
#include <linux/of_graph.h>
#include <linux/component.h>
#include <linux/fence.h>
#include <linux/console.h>
#include <linux/kref.h>
#include <linux/fdtable.h>
#include "vcodec_iommu_ops.h"
struct vcodec_ion_buffer {
struct list_head list;
struct ion_handle *handle;
int index;
};
struct vcodec_iommu_ion_info {
struct ion_client *ion_client;
bool attached;
};
static struct vcodec_ion_buffer *
vcodec_ion_get_buffer_no_lock(struct vcodec_iommu_session_info *session_info,
int idx)
{
struct vcodec_ion_buffer *ion_buffer = NULL, *n;
list_for_each_entry_safe(ion_buffer, n,
&session_info->buffer_list, list) {
if (ion_buffer->index == idx)
return ion_buffer;
}
return NULL;
}
static void
vcodec_ion_clear_session(struct vcodec_iommu_session_info *session_info)
{
/* do nothing */
}
static int vcodec_ion_attach(struct vcodec_iommu_info *iommu_info)
{
struct vcodec_iommu_ion_info *ion_info = iommu_info->private;
int ret;
mutex_lock(&iommu_info->iommu_mutex);
if (ion_info->attached) {
mutex_unlock(&iommu_info->iommu_mutex);
return 0;
}
rockchip_iovmm_activate(iommu_info->dev);
ion_info->attached = true;
mutex_unlock(&iommu_info->iommu_mutex);
return ret;
}
static void vcodec_ion_detach(struct vcodec_iommu_info *iommu_info)
{
struct vcodec_iommu_ion_info *ion_info = iommu_info->private;
mutex_lock(&iommu_info->iommu_mutex);
if (!ion_info->attached) {
mutex_unlock(&iommu_info->iommu_mutex);
return;
}
rockchip_iovmm_deactivate(iommu_info->dev);
ion_info->attached = false;
mutex_unlock(&iommu_info->iommu_mutex);
}
static int vcodec_ion_destroy(struct vcodec_iommu_info *iommu_info)
{
struct vcodec_iommu_ion_info *ion_info = iommu_info->private;
vcodec_ion_detach(iommu_info);
kfree(ion_info);
iommu_info->private = NULL;
return 0;
}
static int
vcodec_ion_free(struct vcodec_iommu_session_info *session_info, int idx)
{
struct vcodec_ion_buffer *ion_buffer;
mutex_lock(&session_info->list_mutex);
ion_buffer = vcodec_ion_get_buffer_no_lock(session_info, idx);
if (!ion_buffer) {
mutex_unlock(&session_info->list_mutex);
pr_err("%s can not find %d buffer in list\n", __func__, idx);
return -EINVAL;
}
list_del_init(&ion_buffer->list);
mutex_unlock(&session_info->list_mutex);
kfree(ion_buffer);
return 0;
}
static int
vcodec_ion_unmap_iommu(struct vcodec_iommu_session_info *session_info, int idx)
{
struct vcodec_ion_buffer *ion_buffer;
struct vcodec_iommu_info *iommu_info = session_info->iommu_info;
struct vcodec_iommu_ion_info *ion_info = iommu_info->private;
mutex_lock(&session_info->list_mutex);
ion_buffer = vcodec_ion_get_buffer_no_lock(session_info, idx);
mutex_unlock(&session_info->list_mutex);
if (!ion_buffer) {
pr_err("%s can not find %d buffer in list\n", __func__, idx);
return -EINVAL;
}
ion_free(ion_info->ion_client, ion_buffer->handle);
return 0;
}
static int
vcodec_ion_map_iommu(struct vcodec_iommu_session_info *session_info, int idx,
unsigned long *iova, unsigned long *size)
{
struct vcodec_ion_buffer *ion_buffer;
struct device *dev = session_info->dev;
struct vcodec_iommu_info *iommu_info = session_info->iommu_info;
struct vcodec_iommu_ion_info *ion_info = iommu_info->private;
int ret = 0;
/* Force to flush iommu table */
rockchip_iovmm_invalidate_tlb(session_info->dev);
mutex_lock(&session_info->list_mutex);
ion_buffer = vcodec_ion_get_buffer_no_lock(session_info, idx);
mutex_unlock(&session_info->list_mutex);
if (!ion_buffer) {
pr_err("%s can not find %d buffer in list\n", __func__, idx);
return -EINVAL;
}
if (session_info->mmu_dev)
ret = ion_map_iommu(dev, ion_info->ion_client,
ion_buffer->handle, iova, size);
else
ret = ion_phys(ion_info->ion_client, ion_buffer->handle,
iova, size);
return ret;
}
static int
vcodec_ion_unmap_kernel(struct vcodec_iommu_session_info *session_info,
int idx)
{
struct vcodec_ion_buffer *ion_buffer;
mutex_lock(&session_info->list_mutex);
ion_buffer = vcodec_ion_get_buffer_no_lock(session_info, idx);
mutex_unlock(&session_info->list_mutex);
if (!ion_buffer) {
pr_err("%s can not find %d buffer in list\n", __func__, idx);
return -EINVAL;
}
return 0;
}
static void *
vcodec_ion_map_kernel(struct vcodec_iommu_session_info *session_info, int idx)
{
struct vcodec_ion_buffer *ion_buffer;
struct vcodec_iommu_info *iommu_info = session_info->iommu_info;
struct vcodec_iommu_ion_info *ion_info = iommu_info->private;
rockchip_iovmm_invalidate_tlb(session_info->dev);
mutex_lock(&session_info->list_mutex);
ion_buffer = vcodec_ion_get_buffer_no_lock(session_info, idx);
mutex_unlock(&session_info->list_mutex);
if (!ion_buffer) {
pr_err("%s can not find %d buffer in list\n", __func__, idx);
return NULL;
}
return ion_map_kernel(ion_info->ion_client, ion_buffer->handle);
}
static int
vcodec_ion_import(struct vcodec_iommu_session_info *session_info, int fd)
{
struct vcodec_ion_buffer *ion_buffer = NULL;
struct vcodec_iommu_info *iommu_info = session_info->iommu_info;
struct vcodec_iommu_ion_info *ion_info = iommu_info->private;
ion_buffer = kzalloc(sizeof(*ion_buffer), GFP_KERNEL);
if (!ion_buffer)
return -ENOMEM;
ion_buffer->handle = ion_import_dma_buf(ion_info->ion_client, fd);
INIT_LIST_HEAD(&ion_buffer->list);
mutex_lock(&session_info->list_mutex);
ion_buffer->index = session_info->max_idx;
list_add_tail(&ion_buffer->list, &session_info->buffer_list);
session_info->max_idx++;
if ((session_info->max_idx & 0xfffffff) == 0)
session_info->max_idx = 0;
mutex_unlock(&session_info->list_mutex);
return ion_buffer->index;
}
static int vcodec_ion_create(struct vcodec_iommu_info *iommu_info)
{
struct vcodec_iommu_ion_info *ion_info;
iommu_info->private = kmalloc(sizeof(*ion_info), GFP_KERNEL);
ion_info = iommu_info->private;
if (!ion_info)
return -ENOMEM;
ion_info->ion_client = rockchip_ion_client_create("vpu");
ion_info->attached = false;
vcodec_ion_attach(iommu_info);
return IS_ERR(ion_info->ion_client) ? -1 : 0;
}
static struct vcodec_iommu_ops ion_ops = {
.create = vcodec_ion_create,
.destroy = vcodec_ion_destroy,
.import = vcodec_ion_import,
.free = vcodec_ion_free,
.free_fd = NULL,
.map_kernel = vcodec_ion_map_kernel,
.unmap_kernel = vcodec_ion_unmap_kernel,
.map_iommu = vcodec_ion_map_iommu,
.unmap_iommu = vcodec_ion_unmap_iommu,
.dump = NULL,
.attach = vcodec_ion_attach,
.detach = vcodec_ion_detach,
.clear = vcodec_ion_clear_session,
};
/*
* we do not manage the ref number ourselves,
* since ion will help us to do that. what we
* need to do is just map/unmap and import/free
* every time
*/
void vcodec_iommu_ion_set_ops(struct vcodec_iommu_info *iommu_info)
{
if (!iommu_info)
return;
iommu_info->ops = &ion_ops;
}

View File

@@ -0,0 +1,255 @@
/**
* Copyright (C) 2016 Fuzhou Rockchip Electronics Co., Ltd
* author: Jung Zhao jung.zhao@rock-chips.com
* Randy Li, randy.li@rock-chips.com
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
* may be copied, distributed, and modified under those terms.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include <linux/slab.h>
#include "vcodec_iommu_ops.h"
static
struct vcodec_iommu_session_info *vcodec_iommu_get_session_info
(struct vcodec_iommu_info *iommu_info, struct vpu_session *session)
{
struct vcodec_iommu_session_info *session_info = NULL, *n;
list_for_each_entry_safe(session_info, n, &iommu_info->session_list,
head) {
if (session_info->session == session)
return session_info;
}
return NULL;
}
int vcodec_iommu_create(struct vcodec_iommu_info *iommu_info)
{
if (!iommu_info || !iommu_info->ops->create)
return -EINVAL;
return iommu_info->ops->create(iommu_info);
}
int vcodec_iommu_import(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session, int fd)
{
struct vcodec_iommu_session_info *session_info = NULL;
if (!iommu_info || !iommu_info->ops->import || !session)
return -EINVAL;
session_info = vcodec_iommu_get_session_info(iommu_info, session);
if (!session_info) {
session_info = kzalloc(sizeof(*session_info), GFP_KERNEL);
if (!session_info)
return -ENOMEM;
INIT_LIST_HEAD(&session_info->head);
INIT_LIST_HEAD(&session_info->buffer_list);
mutex_init(&session_info->list_mutex);
session_info->max_idx = 0;
session_info->session = session;
session_info->mmu_dev = iommu_info->mmu_dev;
session_info->dev = iommu_info->dev;
session_info->iommu_info = iommu_info;
mutex_lock(&iommu_info->list_mutex);
list_add_tail(&session_info->head, &iommu_info->session_list);
mutex_unlock(&iommu_info->list_mutex);
}
session_info->debug_level = iommu_info->debug_level;
return iommu_info->ops->import(session_info, fd);
}
int vcodec_iommu_free(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session, int idx)
{
struct vcodec_iommu_session_info *session_info = NULL;
session_info = vcodec_iommu_get_session_info(iommu_info, session);
if (!iommu_info || !iommu_info->ops->free || !session_info)
return -EINVAL;
return iommu_info->ops->free(session_info, idx);
}
int vcodec_iommu_free_fd(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session, int fd)
{
struct vcodec_iommu_session_info *session_info = NULL;
session_info = vcodec_iommu_get_session_info(iommu_info, session);
if (!iommu_info || !iommu_info->ops->free_fd || !session_info)
return -EINVAL;
return iommu_info->ops->free_fd(session_info, fd);
}
void *vcodec_iommu_map_kernel(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session, int idx)
{
struct vcodec_iommu_session_info *session_info = NULL;
session_info = vcodec_iommu_get_session_info(iommu_info, session);
if (!iommu_info || !iommu_info->ops->map_kernel || !session_info)
return NULL;
return iommu_info->ops->map_kernel(session_info, idx);
}
int vcodec_iommu_unmap_kernel(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session, int idx)
{
struct vcodec_iommu_session_info *session_info = NULL;
session_info = vcodec_iommu_get_session_info(iommu_info, session);
if (!iommu_info || !iommu_info->ops->unmap_kernel || !session_info)
return -EINVAL;
return iommu_info->ops->unmap_kernel(session_info, idx);
}
int vcodec_iommu_map_iommu(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session,
int idx, unsigned long *iova,
unsigned long *size)
{
struct vcodec_iommu_session_info *session_info = NULL;
session_info = vcodec_iommu_get_session_info(iommu_info, session);
if (!iommu_info || !iommu_info->ops->map_iommu || !session_info)
return -EINVAL;
return iommu_info->ops->map_iommu(session_info, idx, iova, size);
}
int vcodec_iommu_unmap_iommu(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session, int idx)
{
struct vcodec_iommu_session_info *session_info = NULL;
session_info = vcodec_iommu_get_session_info(iommu_info, session);
if (!iommu_info || !iommu_info->ops->unmap_iommu || !session_info)
return -EINVAL;
return iommu_info->ops->unmap_iommu(session_info, idx);
}
int vcodec_iommu_destroy(struct vcodec_iommu_info *iommu_info)
{
if (!iommu_info || !iommu_info->ops->destroy)
return -EINVAL;
return iommu_info->ops->destroy(iommu_info);
}
void vcodec_iommu_dump(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session)
{
struct vcodec_iommu_session_info *session_info = NULL;
session_info = vcodec_iommu_get_session_info(iommu_info, session);
if (!iommu_info || !iommu_info->ops->dump || !session_info)
return;
iommu_info->ops->dump(session_info);
}
void vcodec_iommu_clear(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session)
{
struct vcodec_iommu_session_info *session_info = NULL;
session_info = vcodec_iommu_get_session_info(iommu_info, session);
if (!iommu_info || !iommu_info->ops->clear || !session_info)
return;
iommu_info->ops->clear(session_info);
mutex_lock(&iommu_info->list_mutex);
list_del_init(&session_info->head);
kfree(session_info);
mutex_unlock(&iommu_info->list_mutex);
}
int vcodec_iommu_attach(struct vcodec_iommu_info *iommu_info)
{
if (!iommu_info || !iommu_info->ops->attach)
return 0;
return iommu_info->ops->attach(iommu_info);
}
void vcodec_iommu_detach(struct vcodec_iommu_info *iommu_info)
{
if (!iommu_info || !iommu_info->ops->detach)
return;
return iommu_info->ops->detach(iommu_info);
}
struct vcodec_iommu_info *
vcodec_iommu_info_create(struct device *dev,
struct device *mmu_dev,
int alloc_type)
{
struct vcodec_iommu_info *iommu_info = NULL;
iommu_info = kzalloc(sizeof(*iommu_info), GFP_KERNEL);
if (!iommu_info)
return NULL;
iommu_info->dev = dev;
INIT_LIST_HEAD(&iommu_info->session_list);
mutex_init(&iommu_info->list_mutex);
mutex_init(&iommu_info->iommu_mutex);
switch (alloc_type) {
#ifdef CONFIG_DRM
case ALLOCATOR_USE_DRM:
vcodec_iommu_drm_set_ops(iommu_info);
break;
#endif
#ifdef CONFIG_ION
case ALLOCATOR_USE_ION:
vcodec_iommu_ion_set_ops(iommu_info);
break;
#endif
default:
iommu_info->ops = NULL;
break;
}
iommu_info->mmu_dev = mmu_dev;
vcodec_iommu_create(iommu_info);
return iommu_info;
}
int vcodec_iommu_info_destroy(struct vcodec_iommu_info *iommu_info)
{
vcodec_iommu_destroy(iommu_info);
kfree(iommu_info);
return 0;
}

View File

@@ -0,0 +1,128 @@
/**
* Copyright (C) 2016 Fuzhou Rockchip Electronics Co., Ltd
* author: Jung Zhao jung.zhao@rock-chips.com
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
* may be copied, distributed, and modified under those terms.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __VCODEC_IOMMU_OPS_H__
#define __VCODEC_IOMMU_OPS_H__
#include <linux/platform_device.h>
#include "vcodec_service.h"
#define ALLOCATOR_USE_ION 0x00000000
#define ALLOCATOR_USE_DRM 0x00000001
#define DEBUG_IOMMU_OPS_DUMP 0x00020000
#define vpu_iommu_debug_func(debug_level, type, fmt, args...) \
do { \
if (unlikely(debug_level & type)) { \
pr_info("%s:%d: " fmt, \
__func__, __LINE__, ##args); \
} \
} while (0)
#define vpu_iommu_debug(debug_level, type, fmt, args...) \
do { \
if (unlikely(debug_level & type)) { \
pr_info(fmt, ##args); \
} \
} while (0)
struct vcodec_iommu_info;
struct vcodec_iommu_session_info;
struct vcodec_iommu_ops {
int (*create)(struct vcodec_iommu_info *iommu_info);
int (*import)(struct vcodec_iommu_session_info *session_info, int fd);
int (*free)(struct vcodec_iommu_session_info *session_info, int idx);
int (*free_fd)(struct vcodec_iommu_session_info *session_info, int fd);
void *(*map_kernel)(struct vcodec_iommu_session_info *session_info,
int idx);
int (*unmap_kernel)(struct vcodec_iommu_session_info *session_info,
int idx);
int (*map_iommu)(struct vcodec_iommu_session_info *session_info,
int idx,
unsigned long *iova, unsigned long *size);
int (*unmap_iommu)(struct vcodec_iommu_session_info *session_info,
int idx);
int (*destroy)(struct vcodec_iommu_info *iommu_info);
void (*dump)(struct vcodec_iommu_session_info *session_info);
int (*attach)(struct vcodec_iommu_info *iommu_info);
void (*detach)(struct vcodec_iommu_info *iommu_info);
void (*clear)(struct vcodec_iommu_session_info *session_info);
};
struct vcodec_iommu_session_info {
struct list_head head;
struct vpu_session *session;
struct list_head buffer_list;
struct mutex list_mutex;
int max_idx;
struct device *dev;
struct device *mmu_dev;
struct vcodec_iommu_info *iommu_info;
int debug_level;
};
struct vcodec_iommu_info {
struct list_head session_list;
struct mutex list_mutex;
struct mutex iommu_mutex;
struct device *dev;
struct device *mmu_dev;
struct vcodec_iommu_ops *ops;
int debug_level;
void *private;
};
#ifdef CONFIG_DRM
void vcodec_iommu_drm_set_ops(struct vcodec_iommu_info *iommu_info);
#endif
#ifdef CONFIG_ION
void vcodec_iommu_ion_set_ops(struct vcodec_iommu_info *iommu_info);
#endif
struct vcodec_iommu_info *vcodec_iommu_info_create(struct device *dev,
struct device *mmu_dev,
int alloc_type);
int vcodec_iommu_info_destroy(struct vcodec_iommu_info *iommu_info);
int vcodec_iommu_create(struct vcodec_iommu_info *iommu_info);
int vcodec_iommu_import(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session, int fd);
int vcodec_iommu_free(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session, int idx);
int vcodec_iommu_free_fd(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session, int fd);
void *vcodec_iommu_map_kernel(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session, int idx);
int vcodec_iommu_unmap_kernel(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session, int idx);
int vcodec_iommu_map_iommu(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session,
int idx,
unsigned long *iova,
unsigned long *size);
int vcodec_iommu_unmap_iommu(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session,
int idx);
int vcodec_iommu_destroy(struct vcodec_iommu_info *iommu_info);
void vcodec_iommu_dump(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session);
void vcodec_iommu_clear(struct vcodec_iommu_info *iommu_info,
struct vpu_session *session);
int vcodec_iommu_attach(struct vcodec_iommu_info *iommu_info);
void vcodec_iommu_detach(struct vcodec_iommu_info *iommu_info);
#endif

File diff suppressed because it is too large Load Diff