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 A05C9C2BD09 for ; Thu, 27 Jun 2024 17:24:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C75A410EB05; Thu, 27 Jun 2024 17:24:00 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="GVaLzF/a"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B30510EA9D for ; Thu, 27 Jun 2024 17:23:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1719509040; x=1751045040; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=yiE4gnuwckFVtHzOqR4Cmu+YmBxce2vqdFCmgB0Fs5w=; b=GVaLzF/aIOaoYWUANT8AnJajCQR4tt/rQTsY7NiKhUGgJMaK3sf3QhfK I71MC6wYGMcfO80wOI4B7xmbFb9arDAPs3soj9XFcSN7gzKOAvN0BetUa 0QJEaVmjRdHF/+LUbSLjDki0tHtS4uLR3UTuXY9NzfDe4SRA7MxuJQ4wD /ktTYvUPV877S5y6vNI69s2F5uZk7iOa/E/LGNNqdvZYMpcaBUTvt3qEO +o9PaarvIgLUeLgGgdv7kLr1ipKx6az4OGWUBUicSIcNGYQvNa6JavnFH pxbjjp2MhSBAfBagwaCsrZUoC0gXBuQTotB/BbIcPeDpQLdt0swRcH24b Q==; X-CSE-ConnectionGUID: ZZ2bKp6oQjuU+PXakNTlrg== X-CSE-MsgGUID: LcKQ5mClT6mr6UpxTJn25g== X-IronPort-AV: E=McAfee;i="6700,10204,11116"; a="27245542" X-IronPort-AV: E=Sophos;i="6.09,166,1716274800"; d="scan'208";a="27245542" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jun 2024 10:23:58 -0700 X-CSE-ConnectionGUID: NrjMEtruSs2B2skDb2BQfw== X-CSE-MsgGUID: +mH3VME5SQ+6yVcdWAEQHA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,166,1716274800"; d="scan'208";a="49373448" Received: from xpumcyp04.jf.intel.com ([10.75.202.213]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jun 2024 10:23:57 -0700 From: Umesh Nerlige Ramappa To: intel-xe@lists.freedesktop.org Subject: [CI 1/2] drm/xe: Use a helper to get delta run ticks from the exec queue Date: Fri, 28 Jun 2024 01:23:47 +0800 Message-Id: <20240627172348.84991-2-umesh.nerlige.ramappa@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240627172348.84991-1-umesh.nerlige.ramappa@intel.com> References: <20240627172348.84991-1-umesh.nerlige.ramappa@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" As per earlier review feedback - code manipulating exec queue fields should not be present in xe_device.c. Use a helper to get the delta run ticks from exec queue. v2: Drop the Fixes tag Signed-off-by: Umesh Nerlige Ramappa Reviewed-by: Matthew Brost --- drivers/gpu/drm/xe/xe_drm_client.c | 7 ++----- drivers/gpu/drm/xe/xe_exec_queue.c | 18 ++++++++++++++++++ drivers/gpu/drm/xe/xe_exec_queue.h | 1 + 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_drm_client.c b/drivers/gpu/drm/xe/xe_drm_client.c index 4a19b771e3a0..e0c4a50d372c 100644 --- a/drivers/gpu/drm/xe/xe_drm_client.c +++ b/drivers/gpu/drm/xe/xe_drm_client.c @@ -251,11 +251,8 @@ static void show_run_ticks(struct drm_printer *p, struct drm_file *file) /* Accumulate all the exec queues from this client */ mutex_lock(&xef->exec_queue.lock); - xa_for_each(&xef->exec_queue.xa, i, q) { - xe_exec_queue_update_run_ticks(q); - xef->run_ticks[q->class] += q->run_ticks - q->old_run_ticks; - q->old_run_ticks = q->run_ticks; - } + xa_for_each(&xef->exec_queue.xa, i, q) + xef->run_ticks[q->class] += xe_exec_queue_delta_run_ticks(q); mutex_unlock(&xef->exec_queue.lock); /* Get the total GPU cycles */ diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c index 0ba37835849b..4d90a16745d2 100644 --- a/drivers/gpu/drm/xe/xe_exec_queue.c +++ b/drivers/gpu/drm/xe/xe_exec_queue.c @@ -786,6 +786,24 @@ void xe_exec_queue_update_run_ticks(struct xe_exec_queue *q) q->run_ticks += (new_ts - old_ts) * q->width; } +/** + * xe_exec_queue_delta_run_ticks() - Get delta of queue run_ticks + * @q: The exec queue + * + * Update run ticks for the specific queue and then return the delta when + * compared to the previous value of run ticks. + */ +u64 xe_exec_queue_delta_run_ticks(struct xe_exec_queue *q) +{ + u64 delta_ticks; + + xe_exec_queue_update_run_ticks(q); + delta_ticks = q->run_ticks - q->old_run_ticks; + q->old_run_ticks = q->run_ticks; + + return delta_ticks; +} + void xe_exec_queue_kill(struct xe_exec_queue *q) { struct xe_exec_queue *eq = q, *next; diff --git a/drivers/gpu/drm/xe/xe_exec_queue.h b/drivers/gpu/drm/xe/xe_exec_queue.h index 289a3a51d2a2..42f683e5d88a 100644 --- a/drivers/gpu/drm/xe/xe_exec_queue.h +++ b/drivers/gpu/drm/xe/xe_exec_queue.h @@ -76,5 +76,6 @@ struct dma_fence *xe_exec_queue_last_fence_get(struct xe_exec_queue *e, void xe_exec_queue_last_fence_set(struct xe_exec_queue *e, struct xe_vm *vm, struct dma_fence *fence); void xe_exec_queue_update_run_ticks(struct xe_exec_queue *q); +u64 xe_exec_queue_delta_run_ticks(struct xe_exec_queue *q); #endif -- 2.34.1