From patchwork Fri Dec 9 11:21:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Gmeiner X-Patchwork-Id: 9467951 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 17B6960586 for ; Fri, 9 Dec 2016 11:22:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B444285DC for ; Fri, 9 Dec 2016 11:22:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 002CE285F7; Fri, 9 Dec 2016 11:22:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A4D1E285DC for ; Fri, 9 Dec 2016 11:22:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 51AE86E980; Fri, 9 Dec 2016 11:21:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wj0-x241.google.com (mail-wj0-x241.google.com [IPv6:2a00:1450:400c:c01::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 676276E979 for ; Fri, 9 Dec 2016 11:21:50 +0000 (UTC) Received: by mail-wj0-x241.google.com with SMTP id j10so1978612wjb.3 for ; Fri, 09 Dec 2016 03:21:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ANflCN8w//YGag8CGA1C5he4e99YkVl2ALfCYLMzNuE=; b=EUMP22pOkRaVIQSJz3jnxlYort1N3MgdkwaqgN1vd1jzvjcoMbl7pKDjuoEogseJ/y HwpyxTodsJVosljjHGM6qZZ0vdSmtX3MVvnVRKdt3QqlwuIcDiazIr02kD1bX3nLYIHG C8MnlWamGwc2YAQ0+0opd/i4YA54TckXLwfitXgiCSjSuovsKUBn5Md4oNOGLtmx40Nj CbkivRrKj6MwwDglSugmyZ9TJhO2fAmZJUe1vAMKgRUoqAgcjq5yRjplT+idkOPhhzjb p1jjrG8bgeQWu6AORnhnKtn4CzBk9ZQLIPowF8ozqGvGQH/YqyOUcnXuppJum3iQxMt9 qSnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ANflCN8w//YGag8CGA1C5he4e99YkVl2ALfCYLMzNuE=; b=AlfnAQYF/DfPDxOlHEx45/dcjn7F2ssKX6aZKvQzzHrRh+6li2B7Lfw/32+O2EWy/m KjyU0Pri8vyFNdrXOWJzIsSF8q0LJ0U4Ju9sOKUNwaBsGZXZdQHV8HwYAFEp3d4QDK19 mirx2lwgzdSq8yzBUTUCvNglYblYE0UI0VExmvpF9iWk81a2n8GK0Oj/B5lx75bIUxUL 3NFGGIg1K1D60OvGPJQFlfkI83E79NZeIW968QVcqUzWhIDXQofXhHHgN+redPx9u4FD nvGuEGEKe3D7vGA3oLhOk8sFRoad6I40bMZ98MgzO6M+eG9RiREBTOMBSqT4VGB/353+ +Guw== X-Gm-Message-State: AKaTC03Q7Mte13T6AnNzwkoQbrU+pyu1phBjZcz7Z4/ryP8vtYJiHycNAXYgp6NRrtzyZA== X-Received: by 10.194.141.239 with SMTP id rr15mr65930712wjb.144.1481282508571; Fri, 09 Dec 2016 03:21:48 -0800 (PST) Received: from linux.fritz.box.fritz.box (178-190-139-123.adsl.highway.telekom.at. [178.190.139.123]) by smtp.gmail.com with ESMTPSA id v2sm41824518wja.41.2016.12.09.03.21.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Dec 2016 03:21:47 -0800 (PST) From: Christian Gmeiner To: dri-devel@lists.freedesktop.org Subject: [PATCH 03/10] drm/etnaviv: rework error handling Date: Fri, 9 Dec 2016 12:21:24 +0100 Message-Id: <20161209112131.3924-4-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161209112131.3924-1-christian.gmeiner@gmail.com> References: <20161209112131.3924-1-christian.gmeiner@gmail.com> Cc: linux+etnaviv@armlinux.org.uk, cphealy@gmail.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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Prep work for following changes. Signed-off-by: Christian Gmeiner --- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index b1254f8..09aa67a 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -1122,22 +1122,25 @@ struct etnaviv_cmdbuf *etnaviv_gpu_cmdbuf_new(struct etnaviv_gpu *gpu, u32 size, cmdbuf = kzalloc(sz, GFP_KERNEL); if (!cmdbuf) - return NULL; + goto fail; if (gpu->mmu->version == ETNAVIV_IOMMU_V2) size = ALIGN(size, SZ_4K); cmdbuf->vaddr = dma_alloc_wc(gpu->dev, size, &cmdbuf->paddr, GFP_KERNEL); - if (!cmdbuf->vaddr) { - kfree(cmdbuf); - return NULL; - } + if (!cmdbuf->vaddr) + goto fail; cmdbuf->gpu = gpu; cmdbuf->size = size; return cmdbuf; + +fail: + kfree(cmdbuf); + + return NULL; } void etnaviv_gpu_cmdbuf_free(struct etnaviv_cmdbuf *cmdbuf)