UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "drm/panfrost: Use drm_gem_map_offset()" 

This reverts commit 583bbf4613.

Turns out we need mmap to work on imported BOs even if the current code
is buggy.

Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
Rob Herring 2019-07-03 16:37:12 -06:00
parent 0ccf52badd
commit be855382ba
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/panfrost/panfrost_drv.c
View File

@ -259,14 +259,26 @@ static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data,
struct drm_file *file_priv) struct drm_file *file_priv)
{ {
struct drm_panfrost_mmap_bo *args = data; struct drm_panfrost_mmap_bo *args = data;
struct drm_gem_object *gem_obj;
int ret;
if (args->flags != 0) { if (args->flags != 0) {
DRM_INFO("unknown mmap_bo flags: %d\n", args->flags); DRM_INFO("unknown mmap_bo flags: %d\n", args->flags);
return -EINVAL; return -EINVAL;
} }
return drm_gem_map_offset(file_priv, dev, args->handle, gem_obj = drm_gem_object_lookup(file_priv, args->handle);
&args->offset); if (!gem_obj) {
DRM_DEBUG("Failed to look up GEM BO %d\n", args->handle);
return -ENOENT;
}
ret = drm_gem_create_mmap_offset(gem_obj);
if (ret == 0)
args->offset = drm_vma_node_offset_addr(&gem_obj->vma_node);
drm_gem_object_put_unlocked(gem_obj);
return ret;
} }
static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data, static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data,