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

drm/rockchip: gem: support force alloc cma buffer with flags

Browse Source 
Change-Id: I4749eac53609f865d0d4230364b1cbaf39ee0955
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
This commit is contained in:
Mark Yao
2017-07-26 15:44:54 +08:00
committed by Tao Huang
parent e8f625e2c1
commit 51ca868e05
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
View File

@@ -58,7 +58,7 @@ static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper,
size = mode_cmd.pitches[0] * mode_cmd.height;
rk_obj = rockchip_gem_create_object(dev, size, true);
rk_obj = rockchip_gem_create_object(dev, size, true, 0);
if (IS_ERR(rk_obj))
return -ENOMEM;

11
drivers/gpu/drm/rockchip/rockchip_drm_gem.c
View File

@@ -619,7 +619,7 @@ static struct rockchip_gem_object *
struct rockchip_gem_object *
rockchip_gem_create_object(struct drm_device *drm, unsigned int size,
bool alloc_kmap)
bool alloc_kmap, unsigned int flags)
{
struct rockchip_gem_object *rk_obj;
int ret;
@@ -627,6 +627,7 @@ rockchip_gem_create_object(struct drm_device *drm, unsigned int size,
rk_obj = rockchip_gem_alloc_object(drm, size);
if (IS_ERR(rk_obj))
return rk_obj;
rk_obj->flags = flags;
ret = rockchip_gem_alloc_buf(rk_obj, alloc_kmap);
if (ret)
@@ -675,13 +676,13 @@ void rockchip_gem_free_object(struct drm_gem_object *obj)
static struct rockchip_gem_object *
rockchip_gem_create_with_handle(struct drm_file *file_priv,
struct drm_device *drm, unsigned int size,
unsigned int *handle)
unsigned int *handle, unsigned int flags)
{
struct rockchip_gem_object *rk_obj;
struct drm_gem_object *obj;
int ret;
rk_obj = rockchip_gem_create_object(drm, size, false);
rk_obj = rockchip_gem_create_object(drm, size, false, flags);
if (IS_ERR(rk_obj))
return ERR_CAST(rk_obj);
@@ -727,7 +728,7 @@ int rockchip_gem_dumb_create(struct drm_file *file_priv,
args->size = args->pitch * args->height;
rk_obj = rockchip_gem_create_with_handle(file_priv, dev, args->size,
&args->handle);
&args->handle, args->flags);
return PTR_ERR_OR_ZERO(rk_obj);
}
@@ -873,7 +874,7 @@ int rockchip_gem_create_ioctl(struct drm_device *dev, void *data,
struct rockchip_gem_object *rk_obj;
rk_obj = rockchip_gem_create_with_handle(file_priv, dev, args->size,
&args->handle);
&args->handle, args->flags);
return PTR_ERR_OR_ZERO(rk_obj);
}

4
drivers/gpu/drm/rockchip/rockchip_drm_gem.h
View File

@@ -52,8 +52,8 @@ int rockchip_gem_mmap_buf(struct drm_gem_object *obj,
struct vm_area_struct *vma);
struct rockchip_gem_object *
rockchip_gem_create_object(struct drm_device *drm, unsigned int size,
bool alloc_kmap);
rockchip_gem_create_object(struct drm_device *drm, unsigned int size,
bool alloc_kmap, unsigned int flags);
void rockchip_gem_free_object(struct drm_gem_object *obj);

2
include/uapi/drm/rockchip_drm.h
View File

@@ -35,7 +35,7 @@ enum drm_rockchip_gem_mem_type {
ROCKCHIP_BO_WC = 1 << 2,
ROCKCHIP_BO_SECURE = 1 << 3,
ROCKCHIP_BO_MASK = ROCKCHIP_BO_CONTIG | ROCKCHIP_BO_CACHABLE |
ROCKCHIP_BO_WC
ROCKCHIP_BO_WC | ROCKCHIP_BO_SECURE,
};
/**