diff options
Diffstat (limited to 'drivers/gpu/drm/armada/armada_gem.c')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_gem.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index 9f2356bae7fd..887816f43476 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c | |||
| @@ -172,8 +172,9 @@ armada_gem_linear_back(struct drm_device *dev, struct armada_gem_object *obj) | |||
| 172 | obj->dev_addr = obj->linear->start; | 172 | obj->dev_addr = obj->linear->start; |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | DRM_DEBUG_DRIVER("obj %p phys %#x dev %#x\n", | 175 | DRM_DEBUG_DRIVER("obj %p phys %#llx dev %#llx\n", obj, |
| 176 | obj, obj->phys_addr, obj->dev_addr); | 176 | (unsigned long long)obj->phys_addr, |
| 177 | (unsigned long long)obj->dev_addr); | ||
| 177 | 178 | ||
| 178 | return 0; | 179 | return 0; |
| 179 | } | 180 | } |
| @@ -557,7 +558,6 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf) | |||
| 557 | * refcount on the gem object itself. | 558 | * refcount on the gem object itself. |
| 558 | */ | 559 | */ |
| 559 | drm_gem_object_reference(obj); | 560 | drm_gem_object_reference(obj); |
| 560 | dma_buf_put(buf); | ||
| 561 | return obj; | 561 | return obj; |
| 562 | } | 562 | } |
| 563 | } | 563 | } |
| @@ -573,6 +573,7 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf) | |||
| 573 | } | 573 | } |
| 574 | 574 | ||
| 575 | dobj->obj.import_attach = attach; | 575 | dobj->obj.import_attach = attach; |
| 576 | get_dma_buf(buf); | ||
| 576 | 577 | ||
| 577 | /* | 578 | /* |
| 578 | * Don't call dma_buf_map_attachment() here - it maps the | 579 | * Don't call dma_buf_map_attachment() here - it maps the |