Received-SPF: pass (google.com: domain of linux-kernel+bounces-17720-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
To: <intel-xe@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org>,
	<linux-kernel@vger.kernel.org>
CC: Rodrigo Vivi <rodrigo.vivi@intel.com>, Michal Wajdeczko
	<michal.wajdeczko@intel.com>, Maarten Lankhorst
	<maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@gmail.com>,
	Daniel Vetter <daniel@ffwll.ch>, Javier Martinez Canillas
	<javierm@redhat.com>, =?UTF-8?q?Ma=C3=ADra=20Canal?= <mcanal@igalia.com>,
	=?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
Subject: [PATCH v4 1/6] drm/managed: Add drmm_release_action
Date: Fri, 5 Jan 2024 11:13:19 +0100
Message-ID: <20240105101324.26811-2-michal.winiarski@intel.com>
In-Reply-To: <20240105101324.26811-1-michal.winiarski@intel.com>
References: <20240105101324.26811-1-michal.winiarski@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?V2RzeDErdStZR1RiTnAzMzJrL0dsS2VwSUJDUVpuUE85RVQxTDVQUThLU2ND?=
 =?utf-8?B?dGUxNWtZbzF0enY1MHdIanhodkswU0FGUUsvTzV0WkVnSlR6TjhybWU3WjUw?=
 =?utf-8?B?MTl0bzI1NExQZW94MnZyTlk4K1laZDUwQVpIS1BoanU5SjJPVnM5N2lrdjUx?=
 =?utf-8?B?TmNWc0JvaU9iVktUOVdRN3l4UTVBc3pKc2c4VlkvMFkvcHhZNVczTjNLT0pJ?=
 =?utf-8?B?b3draDNySmhRVHB6aUhWQ3Zaa2htNzZiQTNsOS9aWm1nTUgzSWovbklrZlpP?=
 =?utf-8?B?RGo2K3FjcERwbHRVNHN5dGFEMlpoSi9rZmZvUTNQOEV2RHEvcUdGSE8rLzcy?=
 =?utf-8?B?azEyMncrVXhtY0w1MGlDZ3JRbWx1MHlMZkdNYVdsRTVzNXlQTEtOaFoyaFg4?=
 =?utf-8?B?Yk9tYTZXREVMOFNDTElDZkdHazhIUVp4WjJmT3JiaittOVlzRWlncGVUR2cx?=
 =?utf-8?B?cHYzcHluMVAxMHBiQWR6clc3SVhHQTNWMXNXaWh4MVg1MEtJRkN2RUpWUWRM?=
 =?utf-8?B?dk85YVBpR2duZWVjaEZ2dzBHbHpDVElTSTQ2Z0I1MEU1eUdwVjNSRG5peXZ1?=
 =?utf-8?B?dnlqc0xZaW5TTTQwbHI4cmFibk85b3NNb2pIRUs5cXFxeHBwZ0NPb1h1Q2Jj?=
 =?utf-8?B?MjQ1cXg3SGU0bjZWb3hCSjFPb29HbndaR0huQVFnYzdJa0pTeDFNc0RDSnBt?=
 =?utf-8?B?cVRIWnZhdFRPMjJBRnhyaDVmRVFzcW9ZTnNSSmNGMDl0eElKNUJvQjFPQVpl?=
 =?utf-8?B?blNUN2ZOZVhFSkpNMGhac0lwWlcyT0wxVktWY05XT01aUVNYUksxZm5CQmRl?=
 =?utf-8?B?OVA4QWduTUpOa0VReGxrQXNUSU9OV2NXOFVxRmJTNHRuUDBiQ2tFd3laZ3dl?=
 =?utf-8?B?eHg4TkRtMGFPSXBEWHdic1QrZ0pLK1NSYkJvT05XWklqdHpoTnd4UWNPQ2ds?=
 =?utf-8?B?Q0U4NFJielRrb283NzVSSDFHTjAwbVl6TldWN0xZQTFBOUQyb0dtUVY0ZHZq?=
 =?utf-8?B?anM0dHZxb1VtVEU3dzFFa2R1eHk1N0w1bFJRRjdneEcwUHpsZUF5QUZtRmZJ?=
 =?utf-8?B?N2RSSWhCelVTd1cvNTB2OWpFNXNjVnVJZ1VkeVZxWU1JM21tTFJIdHgxeHZn?=
 =?utf-8?B?VmpUY3BOVlgwN2FGTlV4ejJoSXlSeWMwR2pxV0NaVDZuU2JQWVl6ajRDb05u?=
 =?utf-8?B?Zm1DbGpKSy9lODVrSVNzT0NwUG9qd2FsdSs3WCt5OGtjd0tNMTVjSHZNb0Vi?=
 =?utf-8?B?aTFDWWR4NU9DRzJWSmJNRnVMSlBCaDhhK1VoOHhUYVBRK2pFOXY2Sm1LQXJU?=
 =?utf-8?B?MngvcVlveDZDTzR3Z24xaFFrRzZzbFB6VVdIdDY3WUhvNVQrSVpXT002VHp5?=
 =?utf-8?B?Njc1anZnL2haZ1dqZ0VITW82WmoxWVphbDVWa05NVE5tbUlhdnFnY3lFOEdQ?=
 =?utf-8?B?MU42Mkp4OGVkRjdicVVJSDBiQlVjUUdBSnNlVzlPMk5lL2J2V2JteUpDWHk3?=
 =?utf-8?B?a2xhMUJVM3FhNmNTNE9HZEhaN3l1VVNJY24ybWp6ZnVLeWV1aDAxajM3MUdu?=
 =?utf-8?B?TWxudlliMHo5NWZVZ0NPNkExZUVFOUZGZ20yb05PZDZrL0xHTWtjVUZ5V2x1?=
 =?utf-8?B?dTc2dnBqQ3hhNkJ3TGdzemRPZTdVTkYwa1BFc3REbDRCNXB6YktZUXFyNWhS?=
 =?utf-8?B?MXdwTG5IVGxuNUUvRzJCOFFyN0tUWG9CWDg0UENXdjNrbHB0RkxJNU03Rmhp?=
 =?utf-8?B?ZGdyMWlFYkxkZW0zalY1VjZNTmY5VldtWXVvb3I1d0NnaFF3VkhabTM2ZDRI?=
 =?utf-8?B?WTBBQ0Y0d2M5M2tlWHdWRXhNMjdLdlh0MGJiOGE3MFVRNWhMelY1NnFSb1Yy?=
 =?utf-8?B?ZTB2ZHFSUDFEV3VOcjU5L0xWQWdKQ3FNQUpEZmpqUlJrbDdlc2s4YytweER1?=
 =?utf-8?B?TXg2ZzZIWmorQ0NXTHBLeExKZUkvbjZ3Q0ZMK1Z5ZHdqTWxkeGx4M041RFVK?=
 =?utf-8?B?bzVsbXVseDhFb2xEVllCYkVtYmhqUWRxY3RXNWNZRm1WNGYxUmZDZEZuV2ZG?=
 =?utf-8?B?TEtqSlJPTUlkbmc1NUpVRTlXcDJUNG9JTjRrVk1sY2J4L0hiVEd4UDNDT1Jr?=
 =?utf-8?B?SFFoUFdCUTdTWlY2R1owaDZrOHdwUG04NFRIcTJkVTRobjk1U253QXBsZjFD?=
 =?utf-8?B?Q0E9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: ddd326fb-7d65-4026-4d0a-08dc0dd6f982
X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5365.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2024 10:13:34.8979
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: DRt69f/Lv302zLnuNenu2hiZ2//4pg6QrNB7QT2gaO2sJSQeYv5MJVO6U+MLxWWBJNnkjljdX7DQl9cEY3IsEM2VwPBDOar0VDl/LAG6/Cc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR11MB8483
X-OriginatorOrg: intel.com

Similar to devres equivalent, it allows to call the "release" action
directly and remove the resource from the managed resources list.

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
---
 drivers/gpu/drm/drm_managed.c | 39 +++++++++++++++++++++++++++++++++++
 include/drm/drm_managed.h     |  4 ++++
 2 files changed, 43 insertions(+)

diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_managed.c
index bcd111404b128..7646f67bda4e4 100644
--- a/drivers/gpu/drm/drm_managed.c
+++ b/drivers/gpu/drm/drm_managed.c
@@ -176,6 +176,45 @@ int __drmm_add_action_or_reset(struct drm_device *dev,
 }
 EXPORT_SYMBOL(__drmm_add_action_or_reset);
 
+/**
+ * drmm_release_action - release a managed action from a &drm_device
+ * @dev: DRM device
+ * @action: function which would be called when @dev is released
+ * @data: opaque pointer, passed to @action
+ *
+ * This function calls the @action previously added by drmm_add_action()
+ * immediately.
+ * The @action is removed from the list of cleanup actions for @dev,
+ * which means that it won't be called in the final drm_dev_put().
+ */
+void drmm_release_action(struct drm_device *dev,
+			 drmres_release_t action,
+			 void *data)
+{
+	struct drmres *dr_match = NULL, *dr;
+	unsigned long flags;
+
+	spin_lock_irqsave(&dev->managed.lock, flags);
+	list_for_each_entry_reverse(dr, &dev->managed.resources, node.entry) {
+		if (dr->node.release == action) {
+			if (!data || (data && *(void **)dr->data == data)) {
+				dr_match = dr;
+				del_dr(dev, dr_match);
+				break;
+			}
+		}
+	}
+	spin_unlock_irqrestore(&dev->managed.lock, flags);
+
+	if (WARN_ON(!dr_match))
+		return;
+
+	action(dev, data);
+
+	free_dr(dr_match);
+}
+EXPORT_SYMBOL(drmm_release_action);
+
 /**
  * drmm_kmalloc - &drm_device managed kmalloc()
  * @dev: DRM device
diff --git a/include/drm/drm_managed.h b/include/drm/drm_managed.h
index ad08f834af408..f547b09ca0239 100644
--- a/include/drm/drm_managed.h
+++ b/include/drm/drm_managed.h
@@ -45,6 +45,10 @@ int __must_check __drmm_add_action_or_reset(struct drm_device *dev,
 					    drmres_release_t action,
 					    void *data, const char *name);
 
+void drmm_release_action(struct drm_device *dev,
+			 drmres_release_t action,
+			 void *data);
+
 void *drmm_kmalloc(struct drm_device *dev, size_t size, gfp_t gfp) __malloc;
 
 /**
-- 
2.43.0