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 6A3C5C3DA49 for ; Thu, 18 Jul 2024 21:05:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 25F4D10EB1D; Thu, 18 Jul 2024 21:05:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="A0U3oNzT"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6751F10EB1E for ; Thu, 18 Jul 2024 21:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1721336752; x=1752872752; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=jjFMzcJIflShG5TuwkuIOc9v2UNmfuWCDwb4FE7ELW0=; b=A0U3oNzTAXHjk1Fuadlgz/ihu+AyaarXD6Uws+Z6SPbEcpj9gmz+eQLB rVFtkI66ylZqSb2cQoXXYleMWdQRYRkdzDnoKFsTfHFFJMOT7SMQqCw5D Rz/ETKQMaXE+8RKUgmd2FppmSTPuR7uwB8/lDztMzWzxVyRmOV+k+IOis rrd0QpOLDxCRs/TB8BZCWlk0FFaML11HZC/ufo8YVOhb6jGCr/lpEuLLq Mw8Wqc1y8iInIYxfzGOwl2GAShNf/ArmLbK8SL/NgZghDgecAtEAeQ223 Gn/+svOLd2+bcsXMPluczxYeuWnxcLT/BZ2DiQ4Blyd9FH+WGqfQsvUTX A==; X-CSE-ConnectionGUID: T3ULKcCvTzq4+3uUKMeqVQ== X-CSE-MsgGUID: 1FJZgsxQQ4GizCiQccJ7Ng== X-IronPort-AV: E=McAfee;i="6700,10204,11137"; a="30349946" X-IronPort-AV: E=Sophos;i="6.09,218,1716274800"; d="scan'208";a="30349946" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2024 14:05:52 -0700 X-CSE-ConnectionGUID: 72EGS52RSAeTN0ey4Z3VZQ== X-CSE-MsgGUID: 2WGFfUWWR26Pjd87IKptSg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,218,1716274800"; d="scan'208";a="88385251" Received: from unerlige-desk.jf.intel.com ([10.165.21.199]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2024 14:05:52 -0700 From: Umesh Nerlige Ramappa To: intel-xe@lists.freedesktop.org Subject: [PATCH v4 1/4] drm/xe: Move part of xe_file cleanup to a helper Date: Thu, 18 Jul 2024 14:05:45 -0700 Message-Id: <20240718210548.3580382-2-umesh.nerlige.ramappa@intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20240718210548.3580382-1-umesh.nerlige.ramappa@intel.com> References: <20240718210548.3580382-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" In order to make xe_file ref counted, move destruction of xe_file members to a helper. v2: Move xe_vm_close_and_put back into xe_file_close (Matt) Signed-off-by: Umesh Nerlige Ramappa Reviewed-by: Matthew Brost Reviewed-by: Lucas De Marchi --- drivers/gpu/drm/xe/xe_device.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index f51d456d15f7..0a7478d1ee63 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -93,9 +93,25 @@ static int xe_file_open(struct drm_device *dev, struct drm_file *file) return 0; } +static void xe_file_destroy(struct xe_file *xef) +{ + struct xe_device *xe = xef->xe; + + xa_destroy(&xef->exec_queue.xa); + mutex_destroy(&xef->exec_queue.lock); + xa_destroy(&xef->vm.xa); + mutex_destroy(&xef->vm.lock); + + spin_lock(&xe->clients.lock); + xe->clients.count--; + spin_unlock(&xe->clients.lock); + + xe_drm_client_put(xef->client); + kfree(xef); +} + static void xe_file_close(struct drm_device *dev, struct drm_file *file) { - struct xe_device *xe = to_xe_device(dev); struct xe_file *xef = file->driver_priv; struct xe_vm *vm; struct xe_exec_queue *q; @@ -111,21 +127,12 @@ static void xe_file_close(struct drm_device *dev, struct drm_file *file) xe_exec_queue_kill(q); xe_exec_queue_put(q); } - xa_destroy(&xef->exec_queue.xa); - mutex_destroy(&xef->exec_queue.lock); mutex_lock(&xef->vm.lock); xa_for_each(&xef->vm.xa, idx, vm) xe_vm_close_and_put(vm); mutex_unlock(&xef->vm.lock); - xa_destroy(&xef->vm.xa); - mutex_destroy(&xef->vm.lock); - spin_lock(&xe->clients.lock); - xe->clients.count--; - spin_unlock(&xe->clients.lock); - - xe_drm_client_put(xef->client); - kfree(xef); + xe_file_destroy(xef); } static const struct drm_ioctl_desc xe_ioctls[] = { -- 2.38.1