From patchwork Fri Nov 10 21:26:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 10053751 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 D857E603FA for ; Fri, 10 Nov 2017 21:27:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CAF2A2B417 for ; Fri, 10 Nov 2017 21:27:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C01A82B44D; Fri, 10 Nov 2017 21:27:02 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 CC14A2B417 for ; Fri, 10 Nov 2017 21:27:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 106CC6EB58; Fri, 10 Nov 2017 21:27:01 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id EA3176EB58 for ; Fri, 10 Nov 2017 21:26:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 5A7FF10A164E; Fri, 10 Nov 2017 13:26:57 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at anholt.net Received: from anholt.net ([127.0.0.1]) by localhost (kingsolver.anholt.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id KscssZEBV9kA; Fri, 10 Nov 2017 13:26:20 -0800 (PST) Received: from eliezer.anholt.net (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 4EB0D10A1488; Fri, 10 Nov 2017 13:26:20 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id EC4F92FE5296; Fri, 10 Nov 2017 13:26:18 -0800 (PST) From: Eric Anholt To: intel-gfx@lists.freedesktop.org Date: Fri, 10 Nov 2017 13:26:17 -0800 Message-Id: <20171110212618.904-5-eric@anholt.net> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171110212618.904-1-eric@anholt.net> References: <20171110212618.904-1-eric@anholt.net> Subject: [Intel-gfx] [PATCH i-g-t 4/5] lib: Use the imported uapi's addfb2 defines. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Eric Anholt --- lib/ioctl_wrappers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index 7ad2b7b007c4..d98e7660a96f 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -1663,7 +1663,7 @@ void igt_require_fb_modifiers(int fd) uint64_t cap_modifiers; int ret; - ret = drmGetCap(fd, LOCAL_DRM_CAP_ADDFB2_MODIFIERS, &cap_modifiers); + ret = drmGetCap(fd, DRM_CAP_ADDFB2_MODIFIERS, &cap_modifiers); igt_assert(ret == 0 || errno == EINVAL); has_modifiers = ret == 0 && cap_modifiers == 1; cap_modifiers_tested = true; @@ -1691,7 +1691,7 @@ int __kms_addfb(int fd, uint32_t handle, uint32_t width, uint32_t height, f.pitches[0] = stride; f.modifier[0] = modifier; - ret = igt_ioctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f); + ret = igt_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &f); *buf_id = f.fb_id;