From patchwork Wed Jul 3 15:55:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Jacques Hiblot X-Patchwork-Id: 168455 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1912336ilk; Thu, 4 Jul 2019 00:26:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqzzaVbODorXU+0IKWYG7FqvydBrxptOJKcDVcjTYbuQxKj9cB1vBOzuLfIU1Jt773KqREnJ X-Received: by 2002:a17:902:ba8b:: with SMTP id k11mr47602825pls.107.1562225169796; Thu, 04 Jul 2019 00:26:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562225169; cv=none; d=google.com; s=arc-20160816; b=REPrDVEBNtACi7T88zS5PZbf7dl0RnFGaZ5GWsUvBXYXqcblQJn/BGLUabcZN4yjR8 ldJyUU0Lb1lIus4dE2MIbah2icD5jaPQ02dY6MzaGlLe16lsZ108LCT9Jl+5f10478B6 MgBqdPhKuLuP0bUJ/nmxLU3mdDHLbSkit9kncJ2XetxcF3NWKqpJPF/Mukw0EfbkKCws h5hQ//kuiAK1/nPeGVUwnP8P+VPDhwB4xFwhM3J3N3/go3BiKRcm+48091uWeW7/mhW5 wQsA4zSlXZgdCDNry2mxX40lHSPby9mNFBZ8Bx2ZJvpY6MHh2+2qp6pFefdoihaB+V/X LCjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:delivered-to; bh=tkrvNLUK+6YfX1/y/V/4N0XaX/C/LxM6s5IHK1MREyw=; b=z/isoafC+XjcoZogI5E0PW7xYUZa1fkHAHRO8ei9O/Y/DJ5g1NkGI0SheHN+x5LvBS pC3geb43bn7BigWfjkh8T+M9BKti3uBsxCxa+H7OigYbXzwxx8fiZ+8wFQdpQuwFdA+G 7VkKrTT6+9hGSOMwegvbh2gwqT2HIlp2/b8i+LDoAGTnKby/O48l7fit6Sv6LyksS63t y1mdocKDF39n4zwSKXdDbTAO9hFjYLVlt6tkF4MIhYIw2t/HkYkAOE7seAQ+L78YTBp6 A8OCKfW3JikRuTEwYdPPtOGRNMdchDQ6TdotX2Zgntws6GtnGvVjx2ghgWVTzP39AK0y OTOw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id l66si4594018plb.221.2019.07.04.00.26.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Jul 2019 00:26:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B493B6E285; Thu, 4 Jul 2019 07:25:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by gabe.freedesktop.org (Postfix) with ESMTPS id 85F6C6E15A for ; Wed, 3 Jul 2019 15:55:47 +0000 (UTC) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id x63FtjZS059883; Wed, 3 Jul 2019 10:55:45 -0500 Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x63FtjsX001476 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 3 Jul 2019 10:55:45 -0500 Received: from DLEE108.ent.ti.com (157.170.170.38) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Wed, 3 Jul 2019 10:55:45 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Wed, 3 Jul 2019 10:55:45 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id x63FtidQ070121; Wed, 3 Jul 2019 10:55:45 -0500 From: Jean-Jacques Hiblot To: , , , Subject: [PATCH 3/8] drm/omap: accept NULL for dma_addr in omap_gem_pin Date: Wed, 3 Jul 2019 17:55:31 +0200 Message-ID: <20190703155536.28339-4-jjhiblot@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190703155536.28339-1-jjhiblot@ti.com> References: <20190703155536.28339-1-jjhiblot@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Mailman-Approved-At: Thu, 04 Jul 2019 07:25:13 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1562169345; bh=mP6F39u6phwbe5nSbxR5D0TFXwCp5NMy1PkRGxhClQk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=g5iZWIkMXiOvS0tNZZ8TqMLV7bjikfg2EzyHuH/iaLJojNvTWoNjuAbjAAN6Du8Nt LfuZmTIxLYVXaL2ARizzoMWy2cTucZUHTKoVcxixieUQpDJ7lZZVp84qlG0uZNO3GW wVT+Xr4tBkoZ3aqXjOw5tjAeDLb9TwDyK0nq/Br8= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jsarha@ti.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Tomi Valkeinen Allow NULL to be passed in 'dma_addr' for omap_gem_pin(), in case the caller does not need the dma_addr. Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/omap_gem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 2b745b0cfb73..5293535e02ee 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -815,9 +815,11 @@ int omap_gem_pin(struct drm_gem_object *obj, dma_addr_t *dma_addr) refcount_inc(&omap_obj->dma_addr_cnt); - *dma_addr = omap_obj->dma_addr; + if (dma_addr) + *dma_addr = omap_obj->dma_addr; } else if (omap_gem_is_contiguous(omap_obj)) { - *dma_addr = omap_obj->dma_addr; + if (dma_addr) + *dma_addr = omap_obj->dma_addr; } else { ret = -EINVAL; goto fail;