Received-SPF: pass (google.com: domain of linux-kernel+bounces-26301-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
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 v5 1/5] drm/managed: Add drmm_release_action
Date: Mon, 15 Jan 2024 18:13:47 +0100
Message-ID: <20240115171351.504264-2-michal.winiarski@intel.com>
In-Reply-To: <20240115171351.504264-1-michal.winiarski@intel.com>
References: <20240115171351.504264-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?ajRualpoUEw1bDF3NnJ2cTlOVWJrSGpneWFnUHlrU3lFS001SHMzSTJRS21w?=
 =?utf-8?B?Uk12MTV0MURRYkYzbVFEenQ4RUpiZVNxTUVZeUxBZ2ZnVTZNWC9rR0ZqNEFD?=
 =?utf-8?B?MG1Ga21PTzFjVUlKeTZ5UGJvMUFKUWEvQ2JrUDJhKzJCYUNZZ1gzMWRTQWtR?=
 =?utf-8?B?Z01DU0NQZ1FvWHMyKzBQM0U1eUl1NlBadVFyeVU5SkdMYU1rQ3hMNDN3YmF6?=
 =?utf-8?B?QXZ2R1ZIMk01aU1SNVArL1hxNGlOdWVXVHNucG1icFNQd3liekdudVV4K2Fw?=
 =?utf-8?B?cHRvZ2ZyTDhielZIeEhVSitOZm9zZ0VnMlpJd2JJVjl4cW5YKzg4dDZ4MytI?=
 =?utf-8?B?MlJQelZUaVVSS2NNenYxUVEyMjBOMDBGWGNEamxSQzRnbzkrQ3E4SEcxbWdh?=
 =?utf-8?B?WDU2WXcvK0xVWEFpdlJYY045RGFZRWhwaGNmOVdyUTVZb0RtSVR3UFB4K1Ux?=
 =?utf-8?B?SHAyM3U1M2ZQK0ZzcUM3NVFsSWN0OXAwaWk4UVFOcU80WmRLblNVNmxJVFVW?=
 =?utf-8?B?RGVlSlNUV3kveCtpUkhuU1c2emJQYmRGY3FwcG9DRlM4ME5oOUgzdGtyZnVx?=
 =?utf-8?B?TEVmblNNQVdyeU1VNmR0SzZPa0MvaEhobkZiUTF2NlAzQXlwU1FaVUNvdUU0?=
 =?utf-8?B?dzlDUkt2c1B2SEVVWVFOaURxWUtNV3pUVk8wdTNUdEZPRmRLZnNva1JlVks1?=
 =?utf-8?B?ekJXT1BlK0h5N1FmVjd4MTcvRlRVNXZGdEl4RHFySFhDREhqRVIwT1IxK3dr?=
 =?utf-8?B?cXRtV0svdUlBQTJTUC8xZDlmTGdKa21PaFd5UzhPTUp4blNOOUEwMmd0QmJT?=
 =?utf-8?B?cXFpMXc0bW5lMEYzSzQyOHdFdlp6N2V3YlNtTXhYSFZrVXZHZ1ByOWdjVVl3?=
 =?utf-8?B?Y3drbXpJTmhDSWNQRit2NDJGWDNzTFZEOE9IT3BOS29YL1NjdmVJYzZwSWpY?=
 =?utf-8?B?TzA2bEF1OHE2R1hGbXdLUU0ybEljSVZzRVFEem1kUHZqSnhMeFRrbDFjd3dX?=
 =?utf-8?B?WDhLOVFFZm1BKzl6MVQraitma04vZnJXczJ6MjdCSWNwTTFxUkZRQnN6Umtt?=
 =?utf-8?B?Q3NiV3AzY0hwazFZZzhpRm5hUmVWQVFES3NNOFZoaTBZa1d4a1RuY3ZQZFpj?=
 =?utf-8?B?cW0vV21VSEFxNWV3QjdoTFlkcVNudU1sLzRMcXg2bVBDWmlDVkpSZmtPTU9R?=
 =?utf-8?B?Nms2Rm9zejJXU09ybkNUa2RSbXN2cTBpK29zMy8zZ2pDZkJ0WmpRQmZYQi8y?=
 =?utf-8?B?T1lnWVRyQ2ZvTnRLR1JDWGxPUTlXN0lMQXN5OHM4WkhPRnB6NHdMN0pLVFp1?=
 =?utf-8?B?ZitjZzFyUmorQjNYdlNhazZlNGorWHZjNURTd0dZQXJZNi9ydERrTkZxS0lK?=
 =?utf-8?B?WlpuektWMkZZclVwc3JQRStZUFA5aWJWMkliei8rdU92R0xZTC9VVHZ3ZkEy?=
 =?utf-8?B?T0xhTW1uK1hneXJLZThZQU5MaXlpVmJMSUVXS3FyN0RnM2FjcWJTUEVpeVA1?=
 =?utf-8?B?R1BSclZ3ak1EaG9odzhFdVZBWkhyV2NQUEhCNzJWUEdmWHIweng5bXY3dzZp?=
 =?utf-8?B?UFNEWkFpMnVuUEVLLzhONEFHQXdyaVh4c2VGaEYvbjFxcDNYYmo1ZHVsZFRr?=
 =?utf-8?B?K0JSYStpR09IaEwvVTlvRStGSmVVOFVOZVBUR3ozenV3SWRDWGROU1NOYVRz?=
 =?utf-8?B?RGo0ZEowYVoreDhac2oxTnF5QmlKNFRnTWp4YldVY1hCNzloelRLQ1o1T1pQ?=
 =?utf-8?B?L0FTMVF6T0NTMkl0M0wra05zcVc5Y0IxbFU3TDV1cEZ1TDBGdkdkRkpUQk5o?=
 =?utf-8?B?c3VaeHBOSkltSTROaUwxdXNXZ052S0htT2MwYjZGaEI3R2pwc3ZDMHJRTDZR?=
 =?utf-8?B?VjJJNzVXcU43eTR3VVZEcUUvV2xNSE5QVTk3N0JVRHN3RG5xZkxJNEMrQkRU?=
 =?utf-8?B?bm5iMjhGTXp2alcxbUllMzBHZlJ2NVlHRTVVdm5sV2YwZHY0UVFveXdhUEdw?=
 =?utf-8?B?c0FSVWNsU21ZNGJCUmx2QS8yRnlFOEtSVXBIUnhuRXJ0Rk5NbzNOS3JqQlpk?=
 =?utf-8?B?YUdIbHdqVVQ1YTFvU1gxOXJocUtrZDQzd0ZDZ1lyZWROcmhpQzM3R2hqMDBi?=
 =?utf-8?B?RzdHZkc0SGlvbStZcjAySDBRL05IT0FydWdJNi9nTWIySXV5Z2h0dFVTb0R4?=
 =?utf-8?B?dEE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: ca5f2ebb-04d2-4f8a-cb22-08dc15ed6294
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2024 17:14:08.6374
 (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: D1gwLzPAeeLR3bv7MZfbkFuBpVoQ6mA/yDA4C9hO2tgqA1c8Pz+x5V27y4XxhPNy6L9IXUbRDgFcs0M2NiCBf18HN6OVdrCF+qE4pYl7mf8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6391
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