From patchwork Wed Oct 6 16:51:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Previn X-Patchwork-Id: 12539859 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29385C433EF for ; Wed, 6 Oct 2021 16:54:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E4201610E5 for ; Wed, 6 Oct 2021 16:54:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E4201610E5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F7706EDBE; Wed, 6 Oct 2021 16:54:21 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id F1BE36EDBE; Wed, 6 Oct 2021 16:54:19 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10129"; a="312251829" X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="312251829" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2021 09:51:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="458489123" Received: from aalteres-desk.fm.intel.com ([10.80.57.53]) by orsmga002.jf.intel.com with ESMTP; 06 Oct 2021 09:51:16 -0700 From: Alan Previn To: igt-dev@lists.freedesktop.org Cc: Alan Previn , dri-devel@lists.freedesktop.org, Ruhl@freedesktop.org, Michael J , Rodrigo Vivi Subject: [PATCH i-g-t 1/1] tests/i915_pxp: Use ioctl_wrapper for DRM_IOCTL_PRIME_HANDLE_TO_FD Date: Wed, 6 Oct 2021 09:51:51 -0700 Message-Id: <20211006165151.247868-1-alan.previn.teres.alexis@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 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" Replace private helper with call to ioctl_wrapper for DRM_IOCTL_PRIME_HANDLE_TO_FD. Signed-off-by: Alan Previn Reviewed-by: Michael J. Ruhl --- tests/i915/gem_pxp.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/tests/i915/gem_pxp.c b/tests/i915/gem_pxp.c index 79040165..0430f4b8 100644 --- a/tests/i915/gem_pxp.c +++ b/tests/i915/gem_pxp.c @@ -622,23 +622,6 @@ static void test_render_pxp_protsrc_to_protdest(int i915) buf_ops_destroy(bops); } -static int export_handle(int fd, uint32_t handle, int *outfd) -{ - struct drm_prime_handle args; - int ret; - - args.handle = handle; - args.flags = DRM_CLOEXEC; - args.fd = -1; - - ret = drmIoctl(fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &args); - if (ret) - ret = errno; - *outfd = args.fd; - - return ret; -} - static void test_pxp_dmabuffshare_refcnt(void) { uint32_t ctx[2], sbo[2], dbo[2]; @@ -659,8 +642,7 @@ static void test_pxp_dmabuffshare_refcnt(void) dbo[0] = alloc_and_fill_dest_buff(fd[0], true, TSTSURF_SIZE, TSTSURF_INITCOLOR1); } else { - ret = export_handle(fd[0], dbo[0], &dmabuf_fd); - igt_assert(ret == 0); + dmabuf_fd = prime_handle_to_fd(fd[0], dbo[0]); dbo[1] = prime_fd_to_handle(fd[1], dmabuf_fd); igt_assert(dbo[1]); }