From patchwork Thu Jul 2 12:47:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 6708901 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2D9FA9F54C for ; Thu, 2 Jul 2015 12:47:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 388612079F for ; Thu, 2 Jul 2015 12:47:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6ACCD20791 for ; Thu, 2 Jul 2015 12:47:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8BCF87A107; Thu, 2 Jul 2015 05:47:08 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by gabe.freedesktop.org (Postfix) with ESMTPS id D952D7A107 for ; Thu, 2 Jul 2015 05:47:06 -0700 (PDT) MIME-version: 1.0 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NQV031U626HDK30@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 02 Jul 2015 21:47:05 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.112]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 8E.10.29324.9C235955; Thu, 2 Jul 2015 21:47:05 +0900 (KST) X-AuditID: cbfee68d-f79106d00000728c-5d-559532c97ca1 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 12.CC.05312.9C235955; Thu, 2 Jul 2015 21:47:05 +0900 (KST) Received: from localhost.localdomain ([10.252.81.123]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NQV00HMX26H5340@mmp1.samsung.com>; Thu, 02 Jul 2015 21:47:05 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/exynos: fix compile error and warning of g2d Date: Thu, 02 Jul 2015 21:47:05 +0900 Message-id: <1435841225-28060-1-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFLMWRmVeSWpSXmKPExsWyRsSkQPek0dRQg7/3pC2ufH3PZjHp/gQW ixf3LrJYzJj8ks2BxeN+93Emj74tqxgDmKK4bFJSczLLUov07RK4Mp6fiC9YwF1xct8XxgbG 05xdjJwcEgImEq2ffzJD2GISF+6tZ+ti5OIQEljKKLHwzXz2LkYOsKI9V51BaoQEFjFK/Pqi DmLzCghK/Jh8jwWkhFlAXuLIpWyQMLOAusSkeYuYIcb8YJR403OKBSTBJqAncWfbcSYQW0RA WeLvxFWMEA2eEitWzQOLCws4Ssy4/YwVxGYRUJVovXGFBWKXu8Sp55+ZIO6Ukzh5bDIryAIJ gW52iTmfP7JBNAhIfJt8iAXiZlmJTQeg/pKUOLjiBssERpFZSM6ehXD2LCRnL2BkXsUomlqQ XFCclF5kqFecmFtcmpeul5yfu4kRGAWn/z3r3cF4+4D1IUYBDkYlHt6AqimhQqyJZcWVuYcY TYGOmMgsJZqcD4y1vJJ4Q2MzIwtTE1NjI3NLMyVxXkWpn8FCAumJJanZqakFqUXxRaU5qcWH GJk4OKUaGDf/5njY/mTuhUphMRmx8s5L8w87LvewPhIwPfcK7+oHz5MCHnBcfvv3hc3XBKNv As2ln9cabXlybh+n747X7fbT1KanzjeoyTHf0HPq6J0P1vazg00uiefm8X3zOnlu64dIm5fv 7+bp+E+y0n25gb+xR3yq+Aq/96s/W0nyLRPUeKDrsjZqar4SS3FGoqEWc1FxIgDHo+EQfQIA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCIsWRmVeSWpSXmKPExsVy+t9jAd2TRlNDDQ40i1tc+fqezWLS/Qks Fi/uXWSxmDH5JZsDi8f97uNMHn1bVjEGMEU1MNpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZ GOoaWlqYKynkJeam2iq5+AToumXmAK1SUihLzCkFCgUkFhcr6dthmhAa4qZrAdMYoesbEgTX Y2SABhLWMGY8PxFfsIC74uS+L4wNjKc5uxg5OCQETCT2XHXuYuQEMsUkLtxbzwZiCwksYpT4 9UUdxOYVEJT4MfkeC0g5s4C8xJFL2SBhZgF1iUnzFjF3MXIBlf9glHjTc4oFJMEmoCdxZ9tx JhBbREBZ4u/EVYwQDZ4SK1bNA4sLCzhKzLj9jBXEZhFQlWi9cYUFYpe7xKnnn5kg7pGTOHls MusERr5ZSM6YhXDGLCRnLGBkXsUomlqQXFCclJ5rpFecmFtcmpeul5yfu4kRHGPPpHcwrmqw OMQowMGoxMO7omZKqBBrYllxZe4hRgkOZiUR3slcU0OFeFMSK6tSi/Lji0pzUosPMZoCHTiR WUo0OR8Y/3kl8YbGJmZGlkbmhhZGxuZK4rwn831ChQTSE0tSs1NTC1KLYPqYODilGhgXfjlT mOQZ9HI999sbmmmz/jRNn6YxRfLJtglbQhfnSn9T7gyuu2tZeupc5vmMq9ULzPR2sX04cPdm vMCaE5kOV/yqJrO0iIS/Uwk7yb32vd+LRosGDvNr9yYFfQ//c63mXZpsY6yuxjWHq77R81M+ tRq1v17/du7J+oQL7fun+Xopv3p/3XWrEktxRqKhFnNRcSIAUyuYcMcCAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: sw0312.kim@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Should be !g2d_userptr->vec, not !vec. This will fix below compile error. drivers/gpu/drm/exynos/exynos_drm_g2d.c: In function ‘g2d_userptr_get_dma_addr’: drivers/gpu/drm/exynos/exynos_drm_g2d.c:465:7: error: ‘vec’ undeclared (first use in this function) if (!vec) Also, if g2d_userptr->vec is NULL it should assign -ENOMEM in ret. It will fix below compile warning. drivers/gpu/drm/exynos/exynos_drm_g2d.c: In function ‘exynos_g2d_set_cmdlist_ioctl’: drivers/gpu/drm/exynos/exynos_drm_g2d.c:415:6: warning: ‘ret’ may be used uninitialized in this function [-Wmaybe-uninitialized] int ret; ^ Signed-off-by: Joonyoung Shim --- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c index 810e1ee..7584834 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c @@ -462,8 +462,10 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev, end = PAGE_ALIGN(userptr + size); npages = (end - start) >> PAGE_SHIFT; g2d_userptr->vec = frame_vector_create(npages); - if (!vec) + if (!g2d_userptr->vec) { + ret = -ENOMEM; goto err_free; + } ret = get_vaddr_frames(start, npages, true, true, g2d_userptr->vec); if (ret != npages) {