diff options
| author | Rob Herring <robh@kernel.org> | 2019-08-07 10:52:48 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2019-08-07 11:56:48 -0400 |
| commit | e6be0a9913c817689b61a7dc36550b80a3b27f62 (patch) | |
| tree | 61fd8041a3750c075bae7b346c8690044751b368 /drivers | |
| parent | 0a0b65d8eae3eb25dde57f72596b7a7c81a126fa (diff) | |
| download | linux-e6be0a9913c817689b61a7dc36550b80a3b27f62.tar.gz linux-e6be0a9913c817689b61a7dc36550b80a3b27f62.tar.bz2 linux-e6be0a9913c817689b61a7dc36550b80a3b27f62.zip | |
Revert "drm/panfrost: Use drm_gem_map_offset()"
This reverts commit 583bbf46133c726bae277e8f4e32bfba2a528c7f.
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>
Signed-off-by: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190807145253.2037-3-sean@poorly.run
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/panfrost/panfrost_drv.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index b2e325e270b7..b187daa4da85 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -291,14 +291,26 @@ static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_panfrost_mmap_bo *args = data; + struct drm_gem_object *gem_obj; + int ret; if (args->flags != 0) { DRM_INFO("unknown mmap_bo flags: %d\n", args->flags); return -EINVAL; } - return drm_gem_map_offset(file_priv, dev, args->handle, - &args->offset); + gem_obj = drm_gem_object_lookup(file_priv, args->handle); + 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, |