From patchwork Sat Mar 15 07:30:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 3836611 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E0784BF540 for ; Sat, 15 Mar 2014 08:01:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D87F20268 for ; Sat, 15 Mar 2014 08:01:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7F642201EC for ; Sat, 15 Mar 2014 08:01:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AB90A6E00B; Sat, 15 Mar 2014 01:01:05 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout2.samsung.com (unknown [203.254.224.25]) by gabe.freedesktop.org (Postfix) with ESMTP id C67E96E009 for ; Sat, 15 Mar 2014 01:01:04 -0700 (PDT) Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N2G00ISEVIQZT30@mailout2.samsung.com> for dri-devel@lists.freedesktop.org; Sat, 15 Mar 2014 16:30:26 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.113]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 8E.5D.10364.29104235; Sat, 15 Mar 2014 16:30:26 +0900 (KST) X-AuditID: cbfee690-b7f266d00000287c-eb-5324019279e5 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id C6.52.28157.29104235; Sat, 15 Mar 2014 16:30:26 +0900 (KST) Received: from localhost.localdomain ([10.89.71.119]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N2G00IQZVIQVC50@mmp2.samsung.com>; Sat, 15 Mar 2014 16:30:26 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/cma: remove to make sg_table when gem cma is created Date: Sat, 15 Mar 2014 16:30:28 +0900 Message-id: <1394868628-11561-1-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.8.1.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrILMWRmVeSWpSXmKPExsWyRsSkUHcSo0qwwb4n8ha9504yWVz5+p7N YmLTHRYHZo/ZHTNZPbZ/e8Dqcb/7OFMAcxSXTUpqTmZZapG+XQJXxvRjD9gKWngrOrc3sDYw XuTqYuTkkBAwkbhzbgEjhC0mceHeerYuRi4OIYGljBInjy9igim6/v8DO0RiOqPE+f8HWSCc ViaJ/8c+sIJUsQnoSdzZdhysQ0RAWeLvxFVgY5kF7CX2/24GiwsLeErcPfwGKM7BwSKgKvFy uz1ImFfAXWLpkytQVyhI/Lx8AuwKCYHbbBLLFmwCS7AICEh8m3yIBaRXQkBWYtMBZoh6SYmD K26wTGAUXMDIsIpRNLUguaA4Kb3IRK84Mbe4NC9dLzk/dxMjMPhO/3s2YQfjvQPWhxiTgcZN ZJYSTc4HBm9eSbyhsZmRhamJqbGRuaUZacJK4rxqj5KChATSE0tSs1NTC1KL4otKc1KLDzEy cXBKNTCu817/f67rUj3z7voZhsqCcxfPO3BpYWh88dlwtR8y19P67MQCplTsmWWasXfZ7NSF xi+vmK2+Gf7Itld4x5f79zRf138+H35u/9nN7aoztlq8ti20yK/8qX5f++15V4nSSp7iv/ln 7ibOdiyccDa6Rm3j6QNOZ9/LX58lNVP07JFFDFHbtLRclViKMxINtZiLihMB/BzyelQCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHIsWRmVeSWpSXmKPExsVy+t9jQd1JjCrBBjN3SVj0njvJZHHl63s2 i4lNd1gcmD1md8xk9dj+7QGrx/3u40wBzFENjDYZqYkpqUUKqXnJ+SmZeem2St7B8c7xpmYG hrqGlhbmSgp5ibmptkouPgG6bpk5QKuUFMoSc0qBQgGJxcVK+naYJoSGuOlawDRG6PqGBMH1 GBmggYQ1jBnTjz1gK2jhrejc3sDawHiRq4uRk0NCwETi+v8P7BC2mMSFe+vZuhi5OIQEpjNK nP9/kAXCaWWS+H/sAytIFZuAnsSdbceZQGwRAWWJvxNXMYLYzAL2Evt/N4PFhQU8Je4efgMU 5+BgEVCVeLndHiTMK+AusfTJFUaIZQoSPy+fYJvAyL2AkWEVo2hqQXJBcVJ6rpFecWJucWle ul5yfu4mRnBoP5PewbiqweIQowAHoxIP7wUl5WAh1sSy4srcQ4wSHMxKIrw6p4BCvCmJlVWp RfnxRaU5qcWHGJOBlk9klhJNzgfGXV5JvKGxiZmRpZG5oYWRsTlpwkrivAdbrQOFBNITS1Kz U1MLUotgtjBxcEo1MCYsdNASNg+6oPpkMt/+qIUb+mVP7r2QxuWqyV039YJAcuGef03NiYIP j1q8KAgQbtSJeXhUZ8c8W5Gw1x8X/FLd+jFs/+a02oBP59Ofth2+2+J/qU1+l9PyV6m6y9Kt e0Qi7ATus/7e4RizPfjSs9cvv+bXc6WxX7+b+c0yN2ATx3GehvunVyixFGckGmoxFxUnAgDa zDHLsQIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: laurent.pinchart+renesas@ideasonboard.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@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The sg_table made when gem cma is created isn't used anywhere. The sgt of struct drm_gem_cma_object will have only sg_tabel imported. Signed-off-by: Joonyoung Shim Acked-by: Laurent Pinchart --- drivers/gpu/drm/drm_gem_cma_helper.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index 6b51bf9..2c07cb9 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c @@ -79,7 +79,6 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, unsigned int size) { struct drm_gem_cma_object *cma_obj; - struct sg_table *sgt = NULL; int ret; size = round_up(size, PAGE_SIZE); @@ -97,23 +96,9 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, goto error; } - sgt = kzalloc(sizeof(*cma_obj->sgt), GFP_KERNEL); - if (sgt == NULL) { - ret = -ENOMEM; - goto error; - } - - ret = dma_get_sgtable(drm->dev, sgt, cma_obj->vaddr, - cma_obj->paddr, size); - if (ret < 0) - goto error; - - cma_obj->sgt = sgt; - return cma_obj; error: - kfree(sgt); drm_gem_cma_free_object(&cma_obj->base); return ERR_PTR(ret); } @@ -175,10 +160,6 @@ void drm_gem_cma_free_object(struct drm_gem_object *gem_obj) if (cma_obj->vaddr) { dma_free_writecombine(gem_obj->dev->dev, cma_obj->base.size, cma_obj->vaddr, cma_obj->paddr); - if (cma_obj->sgt) { - sg_free_table(cma_obj->sgt); - kfree(cma_obj->sgt); - } } else if (gem_obj->import_attach) { drm_prime_gem_destroy(gem_obj, cma_obj->sgt); }