From mboxrd@z Thu Jan 1 00:00:00 1970 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C06B2CE7D12 for ; Tue, 1 Oct 2024 11:55:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7EB3010E154; Tue, 1 Oct 2024 11:55:31 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="PnwOkilF"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE51410E154 for ; Tue, 1 Oct 2024 11:55:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727783730; x=1759319730; h=message-id:date:mime-version:from:subject:in-reply-to:to: cc:content-transfer-encoding; bh=yThBTqxMrpWsNnvKRSe1kreUuPyF2tJvoBWtTQRfNMk=; b=PnwOkilFVa8SDT7Dgw0DqmzMRBV8M4osBArW7nuRFvHlFa7Lnr58cWJX pdjkMTr08MWPAB9Vz7NxJ4tZG6WshSKqbNxQEYoUdytHUx74mb/yfsIPM EwF7+XPev+ojboZGhvoPUjrD7BB3rEpVV0By/xCgZsHzla4fajf51A76r EhCpgv2ckwGLj9XaU1/ceTAMBK4SZdYIn2njvBY7K6AbFS+5Y5UNMOM5i t+JmBLJHZDb9r0gHvojSXHxKyhzonpdlJ/qNeN2RPNb2t0DnDTRMGyUNo BHuEUJ1J0YoUTogMJg3CSKMwxlOxibFOEC9l7B99xkiUboa9RfkfMC32S A==; X-CSE-ConnectionGUID: 5ucqP3gWRJumDpvDxL2mLQ== X-CSE-MsgGUID: RDywuN3HSam45/IsZm7S5g== X-IronPort-AV: E=McAfee;i="6700,10204,11211"; a="30800333" X-IronPort-AV: E=Sophos;i="6.11,167,1725346800"; d="scan'208";a="30800333" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2024 04:55:29 -0700 X-CSE-ConnectionGUID: GoWJDnoIRZWGAvCRcelg1w== X-CSE-MsgGUID: 0ckMsDl9QqWv8iCo7ncxCA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,167,1725346800"; d="scan'208";a="96996917" Received: from gguerra-mobl1.ger.corp.intel.com (HELO [10.213.200.148]) ([10.213.200.148]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2024 04:55:28 -0700 Message-ID: <40c02084-a197-4eff-a87a-a18453fc11f9@linux.intel.com> Date: Tue, 1 Oct 2024 13:55:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Peter Senna Tschudin Subject: [PATCH i-g-t V2] tests/intel/xe_pm: Fix code style issues Content-Language: en-US In-Reply-To: To: "igt-dev@lists.freedesktop.org" Cc: Kamil Konieczny Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Fix identantion and code style issues that were mostly introduced by 8d2086223. Reviewed-by: Kamil Konieczny Signed-off-by: Peter Senna Tschudin --- tests/intel/xe_pm.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/tests/intel/xe_pm.c b/tests/intel/xe_pm.c index b50d8dbc7..60a2575ea 100644 --- a/tests/intel/xe_pm.c +++ b/tests/intel/xe_pm.c @@ -95,6 +95,7 @@ static void dpms_on_off(device_t device, int mode) static bool runtime_usage_available(struct pci_device *pci) { char name[PATH_MAX]; + snprintf(name, PATH_MAX, "/sys/bus/pci/devices/%04x:%02x:%02x.%01x/runtime_usage", pci->domain, pci->bus, pci->dev, pci->func); return access(name, F_OK) == 0; @@ -267,7 +268,7 @@ child_exec(void *arguments) if (args->flags & USERPTR) { data = aligned_alloc(xe_get_default_alignment(args->device.fd_xe), - bo_size); + bo_size); memset(data, 0, bo_size); } else { if (args->flags & PREFETCH) @@ -284,7 +285,7 @@ child_exec(void *arguments) for (i = 0; i < args->n_exec_queues; i++) { exec_queues[i] = xe_exec_queue_create(args->device.fd_xe, vm, - args->eci, 0); + args->eci, 0); bind_exec_queues[i] = 0; syncobjs[i] = syncobj_create(args->device.fd_xe, 0); }; @@ -294,7 +295,7 @@ child_exec(void *arguments) if (bo) { for (i = 0; i < n_vmas; i++) xe_vm_bind_async(args->device.fd_xe, vm, bind_exec_queues[0], bo, - 0, addr + i * bo_size, bo_size, sync, 1); + 0, addr + i * bo_size, bo_size, sync, 1); } else { xe_vm_bind_userptr_async(args->device.fd_xe, vm, bind_exec_queues[0], to_user_pointer(data), addr, bo_size, sync, 1); @@ -302,7 +303,7 @@ child_exec(void *arguments) if (args->flags & PREFETCH) xe_vm_prefetch_async(args->device.fd_xe, vm, bind_exec_queues[0], 0, - addr, bo_size, sync, 1, 0); + addr, bo_size, sync, 1, 0); if (check_rpm) { igt_assert(in_d3(args->device, args->d_state)); @@ -360,16 +361,16 @@ child_exec(void *arguments) } igt_assert(syncobj_wait(args->device.fd_xe, &sync[0].handle, 1, - INT64_MAX, 0, NULL)); + INT64_MAX, 0, NULL)); sync[0].flags |= DRM_XE_SYNC_FLAG_SIGNAL; if (n_vmas > 1) xe_vm_unbind_all_async(args->device.fd_xe, vm, 0, bo, sync, 1); else xe_vm_unbind_async(args->device.fd_xe, vm, bind_exec_queues[0], 0, - addr, bo_size, sync, 1); + addr, bo_size, sync, 1); igt_assert(syncobj_wait(args->device.fd_xe, &sync[0].handle, 1, - INT64_MAX, 0, NULL)); + INT64_MAX, 0, NULL)); for (i = 0; i < args->n_execs; i++) igt_assert_eq(data[i].data, 0xc0ffee); @@ -449,8 +450,8 @@ child_exec(void *arguments) /** * SUBTEST: %s-%s-basic-exec * Description: - * Setup GPU on %arg[2] state then test exec on %arg[1] state - * without RPM + * Setup GPU on %arg[2] state then test exec on %arg[1] state + * without RPM * Functionality: pm - %arg[1] * GPU requirements: D3 feature should be supported * @@ -468,7 +469,7 @@ child_exec(void *arguments) /** * SUBTEST: %s-vm-bind-%s * DESCRIPTION: Test to check suspend/autoresume on %arg[1] state - * with vm bind %arg[2] combination + * with vm bind %arg[2] combination * Functionality: pm - %arg[1] * * arg[1]: @@ -499,8 +500,8 @@ test_exec(device_t device, int n_exec_queues, int n_execs, enum igt_suspend_state s_state, enum igt_acpi_d_state d_state, unsigned int flags) { - enum igt_suspend_test test = s_state == SUSPEND_STATE_DISK ? - SUSPEND_TEST_DEVICES : SUSPEND_TEST_NONE; + enum igt_suspend_test test = s_state == SUSPEND_STATE_DISK ? + SUSPEND_TEST_DEVICES : SUSPEND_TEST_NONE; struct drm_xe_engine_class_instance *eci; int active_threads = 0; pthread_t threads[65]; /* MAX_ENGINES + 1 */ @@ -519,7 +520,7 @@ test_exec(device_t device, int n_exec_queues, int n_execs, active_threads++; pthread_mutex_lock(&child_ready_lock); - while(!child_ready) + while (!child_ready) pthread_cond_wait(&child_ready_cond, &child_ready_lock); child_ready = false; pthread_mutex_unlock(&child_ready_lock); @@ -582,7 +583,7 @@ static void test_vram_d3cold_threshold(device_t device, int sysfs_fd) } } - threshold = vram_used_mb + (SIZE / 1024 /1024); + threshold = vram_used_mb + (SIZE / 1024 / 1024); igt_require(threshold < vram_total_mb); bo = xe_bo_create(device.fd_xe, 0, SIZE, placement, 0); -- 2.34.1