git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge v5.3-rc1 into drm-misc-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
panfrost
/
panfrost_gem.c
diff --git
a/drivers/gpu/drm/panfrost/panfrost_gem.c
b/drivers/gpu/drm/panfrost/panfrost_gem.c
index b46416be5a546cb02458382224f0383c533a46b6..543ab1b81bd5cfdc474c22ed618531adeb492cff 100644
(file)
--- a/
drivers/gpu/drm/panfrost/panfrost_gem.c
+++ b/
drivers/gpu/drm/panfrost/panfrost_gem.c
@@
-92,8
+92,6
@@
panfrost_gem_prime_import_sg_table(struct drm_device *dev,
pobj = to_panfrost_bo(obj);
- obj->resv = attach->dmabuf->resv;
-
panfrost_mmu_map(pobj);
return obj;