duff/android_kernel_motorola_sm6225
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: remap dmabuf attach during secure transitions

Browse Source 
During secure cb detach, gem objects stored in the aspace
active list are not cleaned up properly leading to crash
when secure cb attaches again. This change remaps dma
buffer for those gem objects.

Change-Id: I7626e87ab60a61261c802a7e7763982546c4c2e7
Signed-off-by: Yashwanth <yvulapu@codeaurora.org>
This commit is contained in:
Yashwanth committed 2020-02-17 15:56:58 +05:30
1 parent 2ce4335f1b
commit a1450df441
2 files changed
+12 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

msm/msm_gem.c
+7 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
* Copyright (C) 2013 Red Hat
* Author: Rob Clark <robdclark@gmail.com>
*
@@ -427,8 +427,9 @@ int msm_gem_get_iova(struct drm_gem_object *obj,
bool reattach = false;
dev = msm_gem_get_aspace_device(aspace);
if (dev && obj->import_attach &&
(dev != obj->import_attach->dev)) {
if ((dev && obj->import_attach) &&
((dev != obj->import_attach->dev) ||
msm_obj->obj_dirty)) {
dmabuf = obj->import_attach->dmabuf;
DRM_DEBUG("detach nsec-dev:%pK attach sec-dev:%pK\n",
@@ -446,6 +447,7 @@ int msm_gem_get_iova(struct drm_gem_object *obj,
PTR_ERR(obj->import_attach));
goto unlock;
}
msm_obj->obj_dirty = false;
reattach = true;
}
@@ -558,6 +560,7 @@ void msm_gem_aspace_domain_attach_detach_update(
if (obj->import_attach) {
mutex_lock(&msm_obj->lock);
put_iova(obj);
msm_obj->obj_dirty = true;
mutex_unlock(&msm_obj->lock);
}
}
@@ -1005,6 +1008,7 @@ static int msm_gem_new_impl(struct drm_device *dev,
INIT_LIST_HEAD(&msm_obj->iova_list);
msm_obj->aspace = NULL;
msm_obj->in_active_list = false;
msm_obj->obj_dirty = false;
if (struct_mutex_locked) {
WARN_ON(!mutex_is_locked(&dev->struct_mutex));
msm/msm_gem.h
+5
View File
@@ -136,6 +136,11 @@ struct msm_gem_object {
struct msm_gem_address_space *aspace;
bool in_active_list;
/* Indicates whether object needs to request for
* new pagetables due to cb switch
*/
bool obj_dirty;
};
#define to_msm_bo(x) container_of(x, struct msm_gem_object, base)