From patchwork Mon Oct 7 11:25:50 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: 175322 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4143403ill; Mon, 7 Oct 2019 04:26:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqyB40J3NnEmkGBwVamoRBmQnITO7atYkgc9K+7ti5M5ogmXStsm0BxXa9+/2PylCFaKAmzT X-Received: by 2002:a63:2062:: with SMTP id r34mr30531075pgm.48.1570447573902; Mon, 07 Oct 2019 04:26:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570447573; cv=none; d=google.com; s=arc-20160816; b=vYjXR7MkvfnsS7zSDfVB1ACicQXEOa7ZDHLOKC8e66kLWUhHjnJ1d143/FyWRNfypQ Qmsix8svikpF9u9uRG9+JhBjl86QPrjkyeN/X8bl2+JaOgb7jZFI3G6bANF/i1wqNiMl 65BOkkHWQm6v89kei6CaMQ5vXW9drcOXs0OiPwIMxcPlCMmGukKurHZDo2uo6sr1bNDH 361IhZxGMrHc1N5EhMwswl1xL8nIJnblkGZCjzO+fqtqITsx7hsnmptwwn5TWvzLaDwC weoW74agbfamiLdcZly5fDnAcvFkhrCorS64j3M7d0jjIpGRCtX55vGc5IL6MzuzgjRJ RvWA== 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=uKXNDzZ5ATmh/Zc8k/YJeitCyjYjADagDIDDsar46bs=; b=GAvw30BJQuhy47IHDqx1oTjxYCZiRIrZ/SNbKqisDxKJ9ysdCuIXVaf+6lt0+nWk6p xNkWZpwULOTvscGyE2GUX7OSKYACb2SMFt/Yr7jrYPVuBlclIKuqWE89duXlkNG/i4MD 6D+i1ISVEE7dtuCoBFtAqQVKK1KueDY+qYkjiL29+g+KwXFpcvz4rZDYXMEZkcejko29 zSFyVLQ2uwZS2xrpYPs9/mLOZXY1gWBPd7mDY+1wAInESa60/bT9ax8TuKcs+9cIrD3q AAWrtZsGY57q4eXWnSGQ2pwkkif+U/4hUAU4D4NZ2K+RomzF2cKczwTUO7ztT4Jyv5eI JAnQ== 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 2610:10:20:722:a800:ff:fe36:1795 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. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id c2si5121719pgw.534.2019.10.07.04.26.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Oct 2019 04:26:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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 EA68D6E55C; Mon, 7 Oct 2019 11:26:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by gabe.freedesktop.org (Postfix) with ESMTPS id 455A06E560 for ; Mon, 7 Oct 2019 11:26:06 +0000 (UTC) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x97BQ4pT078200; Mon, 7 Oct 2019 06:26:04 -0500 Received: from DFLE104.ent.ti.com (dfle104.ent.ti.com [10.64.6.25]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x97BQ4YW122236 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 7 Oct 2019 06:26:04 -0500 Received: from DFLE104.ent.ti.com (10.64.6.25) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Mon, 7 Oct 2019 06:26:04 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE104.ent.ti.com (10.64.6.25) 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; Mon, 7 Oct 2019 06:26:04 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id x97BQ3R4024262; Mon, 7 Oct 2019 06:26:04 -0500 From: Jean-Jacques Hiblot To: , , Subject: [PATCH v3 3/8] drm/omap: accept NULL for dma_addr in omap_gem_pin Date: Mon, 7 Oct 2019 13:25:50 +0200 Message-ID: <20191007112555.25278-4-jjhiblot@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191007112555.25278-1-jjhiblot@ti.com> References: <20191007112555.25278-1-jjhiblot@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1570447564; bh=swFCLcggc3PLeThFKmM/gz3kCxyaq2iegVqXvgg6+yE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Ze4KsWBfRiDa4UzJgAaoPSYBZpdzJ5ywP2091bCcdEV7lG0WaHUMJ3xI2GsNzQdPS xwMMG7m3ziQ77puZLiNHTPsfpcr6Yu7lc2aKKmi66AIawm/sYIIIRxuIuj7AGjaC6r cBLkH0Xd+7Gi25bVsXe9zZyb9dtdP9/6Mo0Kx3Xk= 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, dri-devel@lists.freedesktop.org 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 Reviewed-by: Jean-Jacques Hiblot --- 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 9201c21e206f..a6562d23d314 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -819,9 +819,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;