From patchwork Sat May 24 21:05:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Vincent_Stehl=C3=A9?= X-Patchwork-Id: 4239031 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 06DC6BF90B for ; Sun, 25 May 2014 19:33:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2B6102020A for ; Sun, 25 May 2014 19:33:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BA7B9201FA for ; Sun, 25 May 2014 19:33:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 64B088826D; Sun, 25 May 2014 12:33:54 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [212.27.42.5]) by gabe.freedesktop.org (Postfix) with ESMTP id 77C4A6E0D5 for ; Sat, 24 May 2014 14:05:56 -0700 (PDT) Received: from romuald.bergerie (unknown [88.178.86.202]) by smtp5-g21.free.fr (Postfix) with ESMTP id CC0A3D48092; Sat, 24 May 2014 23:04:00 +0200 (CEST) Received: from radicelle.bergerie (radicelle.bergerie [192.168.124.12]) by romuald.bergerie (Postfix) with SMTP id F0B962B3CE7; Sat, 24 May 2014 23:05:50 +0200 (CEST) Received: by radicelle.bergerie (sSMTP sendmail emulation); Sat, 24 May 2014 23:05:50 +0200 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org Subject: [PATCH linux-next] DRM: Armada: update dma_buf_export use Date: Sat, 24 May 2014 23:05:44 +0200 Message-Id: <1400965544-20092-1-git-send-email-vincent.stehle@laposte.net> X-Mailer: git-send-email 2.0.0.rc2 MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 25 May 2014 12:33:53 -0700 Cc: Russell King , =?UTF-8?q?Vincent=20Stehl=C3=A9?= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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,FREEMAIL_FROM, 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 The dma_buf_export function was updated in commit 4bcec44ffaf9 'dma-buf: use reservation objects' to take a reservation object parameter; update Armada export method accordingly. This fixes the following compilation error: drivers/gpu/drm/armada/armada_gem.c: In function ‘armada_gem_prime_export’: drivers/gpu/drm/armada/armada_gem.c:544:16: error: macro "dma_buf_export" requires 5 arguments, but only 4 given Signed-off-by: Vincent Stehlé Cc: Russell King Cc: David Airlie Cc: Maarten Lankhorst Cc: Sumit Semwal Acked-by: Russell King --- Hi, This can be seen with e.g. linux next-20140523 and arm allmodconfig. Best regards, V. drivers/gpu/drm/armada/armada_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index 887816f..7adb0c3 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -541,7 +541,7 @@ armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, int flags) { return dma_buf_export(obj, &armada_gem_prime_dmabuf_ops, obj->size, - O_RDWR); + O_RDWR, NULL); } struct drm_gem_object *