Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
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 1/2] drm/managed: Add drmm_release_action
Date:   Wed, 29 Nov 2023 23:14:11 +0100
Message-ID: <20231129221412.1180549-2-michal.winiarski@intel.com>
In-Reply-To: <20231129221412.1180549-1-michal.winiarski@intel.com>
References: <20231129221412.1180549-1-michal.winiarski@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U0NYVjlqdHBQcEhHV2ttYVZmNjVNYUhNZUFaQXp0dGxYbThjeXZwQUlXZXBs?=
 =?utf-8?B?NTkrcTd1QUhhWFVpSWJKajFwc0JINktHQkpOS0pjd21QM1BKZjllVGFPMjBB?=
 =?utf-8?B?bE5tSXRKaXQ4UUF2U095SklpZ3lWdnR2UTlpay84M2RMS0tpOWRQUzBsbmtU?=
 =?utf-8?B?cTBrRVg4R1RhTENsQ0l1YmllVkNSZGdVam9oVkxlK053MHhFZWpsMzJWY2ZS?=
 =?utf-8?B?SUtvSWVXTmtYaUFpRzdzY3ZIazQwU3hCOGZWSWs0angzc1JKTFlHWUNZTE1F?=
 =?utf-8?B?T2hDQ2xPeWxVaVMzZEJPN2RINnFVeE9EU3kwN0pnR0YvVml6ODBpcWZjeU1U?=
 =?utf-8?B?T0lyMk8wNWszL2pFZ2M4VG9GR2llTkFEY0hqNzZmR1RRTzBYam1JUGc5VTBI?=
 =?utf-8?B?aThoWUhVNE9tL1RjMXg4NmtaWDhCcnBaYlNSaHpvM1FyK1I5MTh6cjlKSFFN?=
 =?utf-8?B?UVhpdVdNa29zWGdTYUZON2tIOXY1U0RoR0d2S0VrNlZYMk9raTNuZ1dHSmV6?=
 =?utf-8?B?TWhpZW1PbFUrazBLWjIrdmVOREFHSXZPM0ZxZGZRZlE3SThGaE1qcEpyY043?=
 =?utf-8?B?ekZUWGtNdDExZHI1TmM0QmR2cnFnUFhEVk0yQUo3UVFGeVVIN2Y4SEJRdEw2?=
 =?utf-8?B?ZldhbE0wWGdCRDEwTlNlYmtwcUhmdU1wME93N1hqWEhLa0tYWFNuSjVxd1F6?=
 =?utf-8?B?Tk41cnBqOFZiVkgyb3RaN25nTmxLUmV4eEhBOWU1U1dJTmhYcEowTVlYZTNE?=
 =?utf-8?B?c2lxWEpZWUtHRzZCTHdQRld2WGdVdWhMMXVNcTA5bkhqZ3MyTVl1eFhkb1Ay?=
 =?utf-8?B?LzA2N3ZVU3QvTkpKZW4yMER1bVZCeXFxNG1vQ0tETWIxWGtZOHBJcXZUeE0z?=
 =?utf-8?B?T0RBVnQyYWtqVkI4ZDdrRlRVQmhnL0x3QUh5UXRDeWdySDdScUk5OEovSEtB?=
 =?utf-8?B?T1liMG14cStWb2tlYUR3Z0JIL1VzbVlWRTloYWJ5SVh5ajB1aFkvWk5adzc4?=
 =?utf-8?B?ZEV0RkoySUtwS2FqQUR2SXFERlgvZWxIcll0Z25makZOMHFIdFdvb3BQWEFT?=
 =?utf-8?B?THZYQXg3Rm03U2kramRiSUphZG5LWW9YS0ZoYXc0V0Qxc1lsU1dJTHR1L1pp?=
 =?utf-8?B?R21uL2gwZjBWQlZvM2FMU3NxS2JXdUIzMmE3YVRseURxTzQ3MUg0VjBvL2xR?=
 =?utf-8?B?TUc4WnBCSkViTCs0Q3g0Vyt2RmRvMmJ0c3FDWFh4Tjc0U213NmpuNUxQVWRi?=
 =?utf-8?B?Tjh3MlEySFp5MEh2cjNsTmU3VjhTOVUzeEpBMTcwem1HZjlRTDhWRm1sSnBh?=
 =?utf-8?B?Y0llT2JvK0szVGpyVXJFSGRpd2xhNkxlYURmTFVBbXJhc3RWVDc1TzRLRDd2?=
 =?utf-8?B?SnNHd09teW1KNXNQWTNyaituZTJtU0tZdHlkemFRTDE3RDhjenI2MCtYdTRh?=
 =?utf-8?B?Ni9hQUhNVnFwZ3plUUtDTmZSWVB0OU9sVE5YN3pxOHhOSDhEeFEyc0VmdFN0?=
 =?utf-8?B?QnNjanZwcUhJMktHd1hpZXRvbzFDaWxBMkxOK2oyVVdpTktKQmlyRWNqSjZJ?=
 =?utf-8?B?Q1NhdEk2U1cxVUpPV1MyRWlQTzMvZEd3Tmd3UEtJeE5TSXc2M2NLRDdKRWdK?=
 =?utf-8?B?Wldab2hSRktpS3BiWGNweENIY1h1Q1JwVkNyVUJWd3lZZjIwNFBLWGpjK05j?=
 =?utf-8?B?VEQwbUJCSGFqY0hTODZQZzNrcWNYWUVTUTJMTmdXbmtCUU9zd09CM25zMFBC?=
 =?utf-8?B?ZkRBSlliUytuNTFCTjYxMy9GWHEzZ1o1aHBERElzWGxsNDVYME4zQktsa3N5?=
 =?utf-8?B?QU1rMmw2UUFLYUg1ZzhYcEFCZmdWdTBQK09vYk1MMHhONzQyYjdUWTA2WU9z?=
 =?utf-8?B?TkZsamdtaHhoMWVzVENNK3BoQS9LN0E0WVNlUlNnYVRKQUttanFsYTJ3Yllq?=
 =?utf-8?B?TExhaVBTN3E4c2xNZnZqenhtUnY3WVViN0ZNNVBIcmRVMVc3bVpSbGk2UE5v?=
 =?utf-8?B?bERBZHNQOFJaYkhESlFRNHgyNThGZEt4S2UwVTZXQUd0NEJSL250TnpiZHhD?=
 =?utf-8?B?Z3g4a09JN0ZoeGJ1Mk9BMXBWZXdlWTVFQ0ViSm92NjJFVnN0SnczMEhxWmdq?=
 =?utf-8?B?ck9DdW9DK0ZxRmpvSHNHanJkZkptMkYzWmluMjVFTWpOak5PbG5ZN2JLQUVr?=
 =?utf-8?B?eUE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: f2a50c92-ea8f-4863-7dab-08dbf1289806
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 22:14:45.5696
 (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: lfvecdOGDugG0VjZp4LfQVMqZrDkvSJ+ZZaihKkDq19M3fpyw564pkkuatWYhJvij74ZKOtWkmYLm1vtLEZW1W/Z5+zJUEASeayKFyzVKmA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR11MB8432
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 29 Nov 2023 14:15:25 -0800 (PST)

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>
---
 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