diff options
author | Inki Dae <inki.dae@samsung.com> | 2012-11-02 03:10:39 -0400 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2012-12-04 00:45:59 -0500 |
commit | ea6d66c3a797376d21b23dc8261733ce35970014 (patch) | |
tree | 3ff7cdc220296bc3d27aa3decfcf07eca87227ea | |
parent | d87342c10de68d75ecd976556299c68a300c3834 (diff) |
drm/exynos: remove EXYNOS_BO_NONCONTIG type checking.
With iommu support, non-continuous buffer also is supported so
this patch removes these checking from exynos_drm_gem_get/put_dma_addr
funciton.
This patch is based on the below patch set, "drm/exynos: add
iommu support for -next".
http://www.spinics.net/lists/dri-devel/msg29041.html
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_gem.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 8cb6824923c8..b130e6d1a529 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c | |||
@@ -281,14 +281,6 @@ dma_addr_t *exynos_drm_gem_get_dma_addr(struct drm_device *dev, | |||
281 | 281 | ||
282 | exynos_gem_obj = to_exynos_gem_obj(obj); | 282 | exynos_gem_obj = to_exynos_gem_obj(obj); |
283 | 283 | ||
284 | if (exynos_gem_obj->flags & EXYNOS_BO_NONCONTIG) { | ||
285 | DRM_DEBUG_KMS("not support NONCONTIG type.\n"); | ||
286 | drm_gem_object_unreference_unlocked(obj); | ||
287 | |||
288 | /* TODO */ | ||
289 | return ERR_PTR(-EINVAL); | ||
290 | } | ||
291 | |||
292 | return &exynos_gem_obj->buffer->dma_addr; | 284 | return &exynos_gem_obj->buffer->dma_addr; |
293 | } | 285 | } |
294 | 286 | ||
@@ -307,14 +299,6 @@ void exynos_drm_gem_put_dma_addr(struct drm_device *dev, | |||
307 | 299 | ||
308 | exynos_gem_obj = to_exynos_gem_obj(obj); | 300 | exynos_gem_obj = to_exynos_gem_obj(obj); |
309 | 301 | ||
310 | if (exynos_gem_obj->flags & EXYNOS_BO_NONCONTIG) { | ||
311 | DRM_DEBUG_KMS("not support NONCONTIG type.\n"); | ||
312 | drm_gem_object_unreference_unlocked(obj); | ||
313 | |||
314 | /* TODO */ | ||
315 | return; | ||
316 | } | ||
317 | |||
318 | drm_gem_object_unreference_unlocked(obj); | 302 | drm_gem_object_unreference_unlocked(obj); |
319 | 303 | ||
320 | /* | 304 | /* |