From patchwork Sun Nov 4 05:07:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inki Dae X-Patchwork-Id: 1693451 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 972DA3FCDE for ; Sun, 4 Nov 2012 06:34:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 97BF19EB03 for ; Sat, 3 Nov 2012 23:34:45 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D7B59EB03 for ; Sat, 3 Nov 2012 22:07:47 -0700 (PDT) Received: by mail-pb0-f49.google.com with SMTP id xa7so2997934pbc.36 for ; Sat, 03 Nov 2012 22:07:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=WN/1iMqm8jor/GIR0NBXT1HYv6Z353jMSF7o2xz+4n0=; b=khGvoZDpfwC5XGnbWD37LLFqmkebJbytOLAG4zxKRdR7q5+9BXGVBI9PoS5vfF1Gx6 SI8AXiJRu91HS/BZVzAZcMjqcbuIQSm2oLRiwRacwNWS/p6m9Im9F7VoovOfVQe9zrPJ Qiq45eNeoT4AgfESVITBcJeFeHkpDbQJysusLyahi1C3CEliLItFJLrLd3hg4VTU2iMl qgFOJlmYaIHvRqerP3m6zHD1dkvi7ZJ5I3bY4S1VUjFNaSMjAgncVjEbyFsBzrWAo+js VGUT6jqDGblzHrFstMN/mXKa1Z0JJCiFV98n4ruTlc0sqWba9G+aHuB0BX+obJfnMwhX Wp/Q== Received: by 10.68.134.130 with SMTP id pk2mr19863026pbb.31.1352005667354; Sat, 03 Nov 2012 22:07:47 -0700 (PDT) Received: from localhost.localdomain ([222.117.162.7]) by mx.google.com with ESMTPS id gl9sm8389391pbc.51.2012.11.03.22.07.44 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 03 Nov 2012 22:07:46 -0700 (PDT) From: inki.dae@samsung.com To: airlied@linux.ie, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/exynos: remove EXYNOS_BO_NONCONTIG type checking. Date: Sat, 3 Nov 2012 22:07:20 -0700 Message-Id: <1352005640-11877-1-git-send-email-inki.dae@samsung.com> X-Mailer: git-send-email 1.8.0.rc3.16.g8ead1bf Cc: kyungmin.park@samsung.com, sw0312.kim@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org From: Inki Dae 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 Signed-off-by: Kyungmin Park --- drivers/gpu/drm/exynos/exynos_drm_gem.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 8cb6824..b130e6d 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, exynos_gem_obj = to_exynos_gem_obj(obj); - if (exynos_gem_obj->flags & EXYNOS_BO_NONCONTIG) { - DRM_DEBUG_KMS("not support NONCONTIG type.\n"); - drm_gem_object_unreference_unlocked(obj); - - /* TODO */ - return ERR_PTR(-EINVAL); - } - return &exynos_gem_obj->buffer->dma_addr; } @@ -307,14 +299,6 @@ void exynos_drm_gem_put_dma_addr(struct drm_device *dev, exynos_gem_obj = to_exynos_gem_obj(obj); - if (exynos_gem_obj->flags & EXYNOS_BO_NONCONTIG) { - DRM_DEBUG_KMS("not support NONCONTIG type.\n"); - drm_gem_object_unreference_unlocked(obj); - - /* TODO */ - return; - } - drm_gem_object_unreference_unlocked(obj); /*