From patchwork Fri May 20 22:59:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9130147 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 5D04060762 for ; Fri, 20 May 2016 22:59:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50B8527C23 for ; Fri, 20 May 2016 22:59:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4546227CC9; Fri, 20 May 2016 22:59:55 +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, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07F8E27C23 for ; Fri, 20 May 2016 22:59:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 780566EB22; Fri, 20 May 2016 22:59:53 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8A87B6E201 for ; Fri, 20 May 2016 22:59:51 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 5F6B926120C From: robert.foss@collabora.com To: daniel.vetter@ffwll.ch, daniel.stone@collabora.com, marius.c.vlad@intel.com, tomeu.vizoso@collabora.com, emil.velikov@collabora.com Date: Fri, 20 May 2016 18:59:29 -0400 Message-Id: <1463785173-17557-6-git-send-email-robert.foss@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1463785173-17557-1-git-send-email-robert.foss@collabora.com> References: <1463785173-17557-1-git-send-email-robert.foss@collabora.com> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [RFC i-g-t 5/9] tests/gem_ppgtt: Switched to new aliases of intel specific functions. 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 From: Robert Foss Switched from drm_XXX aliases drm_intel_XXX aliases for symbols where that switch is possible. Signed-off-by: Robert Foss Reviewed-by: Emil Velikov Reviewed-by: Emil Velikov --- tests/gem_ppgtt.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/gem_ppgtt.c b/tests/gem_ppgtt.c index 1a620ad..eb15ca5 100644 --- a/tests/gem_ppgtt.c +++ b/tests/gem_ppgtt.c @@ -74,11 +74,11 @@ static void scratch_buf_init(struct igt_buf *buf, static void scratch_buf_fini(struct igt_buf *buf) { - dri_bo_unreference(buf->bo); + drm_intel_bo_unreference(buf->bo); memset(buf, 0, sizeof(*buf)); } -static void fork_rcs_copy(int target, dri_bo **dst, int count, unsigned flags) +static void fork_rcs_copy(int target, drm_intel_bo **dst, int count, unsigned flags) #define CREATE_CONTEXT 0x1 { igt_render_copyfunc_t render_copy; @@ -143,7 +143,7 @@ static void fork_rcs_copy(int target, dri_bo **dst, int count, unsigned flags) } } -static void fork_bcs_copy(int target, dri_bo **dst, int count) +static void fork_bcs_copy(int target, drm_intel_bo **dst, int count) { int devid; @@ -167,7 +167,7 @@ static void fork_bcs_copy(int target, dri_bo **dst, int count) igt_assert(batch); for (int i = 0; i <= target; i++) { - dri_bo *src[2]; + drm_intel_bo *src[2]; src[0] = create_bo(dst[child]->bufmgr, ~0); @@ -177,13 +177,13 @@ static void fork_bcs_copy(int target, dri_bo **dst, int count) intel_copy_bo(batch, src[0], src[1], SIZE); intel_copy_bo(batch, dst[child], src[0], SIZE); - dri_bo_unreference(src[1]); - dri_bo_unreference(src[0]); + drm_intel_bo_unreference(src[1]); + drm_intel_bo_unreference(src[0]); } } } -static void surfaces_check(dri_bo **bo, int count, uint32_t expected) +static void surfaces_check(drm_intel_bo **bo, int count, uint32_t expected) { for (int child = 0; child < count; child++) { uint32_t *ptr; @@ -322,7 +322,7 @@ int main(int argc, char **argv) igt_subtest_init(argc, argv); igt_subtest("blt-vs-render-ctx0") { - dri_bo *bcs[1], *rcs[N_CHILD]; + drm_intel_bo *bcs[1], *rcs[N_CHILD]; fork_bcs_copy(0x4000, bcs, 1); fork_rcs_copy(0x8000 / N_CHILD, rcs, N_CHILD, 0); @@ -334,7 +334,7 @@ int main(int argc, char **argv) } igt_subtest("blt-vs-render-ctxN") { - dri_bo *bcs[1], *rcs[N_CHILD]; + drm_intel_bo *bcs[1], *rcs[N_CHILD]; fork_rcs_copy(0x8000 / N_CHILD, rcs, N_CHILD, CREATE_CONTEXT); fork_bcs_copy(0x4000, bcs, 1);