Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
armada
/
armada_gem.c
diff --git
a/kernel/drivers/gpu/drm/armada/armada_gem.c
b/kernel/drivers/gpu/drm/armada/armada_gem.c
index
580e10a
..
60a688e
100644
(file)
--- a/
kernel/drivers/gpu/drm/armada/armada_gem.c
+++ b/
kernel/drivers/gpu/drm/armada/armada_gem.c
@@
-69,8
+69,9
@@
void armada_gem_free_object(struct drm_gem_object *obj)
if (dobj->obj.import_attach) {
/* We only ever display imported data */
if (dobj->obj.import_attach) {
/* We only ever display imported data */
- dma_buf_unmap_attachment(dobj->obj.import_attach, dobj->sgt,
- DMA_TO_DEVICE);
+ if (dobj->sgt)
+ dma_buf_unmap_attachment(dobj->obj.import_attach,
+ dobj->sgt, DMA_TO_DEVICE);
drm_prime_gem_destroy(&dobj->obj, NULL);
}
drm_prime_gem_destroy(&dobj->obj, NULL);
}