Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
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 v3 1/3] drm/managed: Add drmm_release_action
Date:   Mon, 11 Dec 2023 23:09:37 +0100
Message-ID: <20231211220939.215024-2-michal.winiarski@intel.com>
In-Reply-To: <20231211220939.215024-1-michal.winiarski@intel.com>
References: <20231211220939.215024-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?R082L2pyeUxEeXN5VkpJMm1LdE84am51c0RaUGZCd0t5bXZ4NmZZMnZIcjdh?=
 =?utf-8?B?UkxuVm9tZkNwVjhqMm1TeUpTbVFuN0sraTZrMTFLc1RyMU0vK0MrTmFVYTRO?=
 =?utf-8?B?QXZzbzR2SEhYWHEwaHcycStLbTBPTWpGNThCVGJaSUtUYW9vNnp1V3RLNndl?=
 =?utf-8?B?RWg4c0RjdEVPZzM2YldOSit5d2NVQ0ZMNWRYSGMrbVAwbTlFdVIzeG9tTDRM?=
 =?utf-8?B?aFRmcE9VRmlOQU44M3RpRlVjeEtybnAreFlPdmpJd1cvQmM2S0ZQcmErbHRL?=
 =?utf-8?B?U3QreTAxWWRkcXhLVStKQmlkekgvTFkxbjRnUXFseFBQbCsyM3hMUFdpRnBS?=
 =?utf-8?B?eWJuRXJvTjc2NVNTNWxKWWdRMTk5eDM0SFNSYm5mdXRhV0ZySk53RkVsbEhq?=
 =?utf-8?B?bndXUkFadDNNM2Jkb3hURmJ3OWNWL3g0RDJTUi9pQVBtNUFQdXhHU3krZmVz?=
 =?utf-8?B?Tm80MHZieFpTNmpVd09RbzFMaWdVL2JDOFpXaklEaE9Tdy9SaTFDN0NOMWdH?=
 =?utf-8?B?bUlrSG5aQ3BTVkM2NFByWXRpOTVNSlh0a2FXcEY4bkdyYjRuOElFTEZFZHAz?=
 =?utf-8?B?RDlIdDhtcnhSaDNYY0o1cW1sbU0xVjRhaGpLZEZSSkFHeDZMampwWkNSVHFo?=
 =?utf-8?B?ZWxGcktTOTlVVEZHTXJtMnJhaHE2R2ZaWlgxZEM5R1huNFJ1ZFFLN2xLUmxm?=
 =?utf-8?B?NndTN3VwWG4zR1haNFJpenhQMmppcVZMSC9mNHVKNnkvMTBoT05kUGhhWHYw?=
 =?utf-8?B?OU1tNk1MSzV2c0RxQ0tHc2IvdU5IdWQyU05hVXFDOXVMV1JkQldqb3dCRWUw?=
 =?utf-8?B?c0d4SmFxQTNLVit5ZTFXYlRaODVhbnJ6K2RMNmFma2ZJM1hNS2JzMkFZRXJk?=
 =?utf-8?B?SURLRDNUeFppeXlYR2JTSGFwK1BNdm1zWVgwK05TZ1gxUytzNnlHM2tEVEZJ?=
 =?utf-8?B?cnBjdythYnVPR2Y2R0ZNNWpqdlRXU0JpSXNPNXpaWkkzRklWY1FYMmhQMlVj?=
 =?utf-8?B?OFhHR1dPVDJvRHJNWHFYSC9lTEs5U0V1S2lHSkxXcDZmT0RGSXd0dlE4WGZh?=
 =?utf-8?B?NGd6clRzQjJVQXFCMTZoWFFSRk1FSmxNN2V2SmoxTVB4Yys0MSs3NHczWUo1?=
 =?utf-8?B?UU1BN0Vid0pTU1JrMVc3cjJTV05kcWhRVkZOMmVKbjJiZ3F6MHdlUzV5dklB?=
 =?utf-8?B?ZjByK3BndDJFVWsrVWhIZ0VXYTNXWjZ5VDhJWGlCSnJUUFgxSkJjaHpLWXp4?=
 =?utf-8?B?eGc4a1RkQ1QvTjJaenpaVnNGZWEwZktsSnBzSG9FbGJtN1dFZ0VLUHl0MEdO?=
 =?utf-8?B?SzBTSEpPOHV1QUNtdTlWV0VDS1N1aUdJTTFSbEUreGtEb0R6STIxek5kMVQv?=
 =?utf-8?B?M2p3STVOOVVBR1M1VlFxUHE2eDg0VnBPanpIUlB3S0JXRFlKMEErQVo4RHNB?=
 =?utf-8?B?a0dyR0dBQzBtdXpMcmpVMkRkK0dHR2hIaFpKa0pudHViUCtod3VCekRsRUVT?=
 =?utf-8?B?TDVKT2RWNXFrYW85aUxSWXBoMC91ZlNLYlhYMHdvQTBEdUhLT3dKQXYzSERK?=
 =?utf-8?B?NUJqbW96RnNkYkxnR3pWZU9zNnpzNlRSM0FGOTJCR21GVG01ZnZBVUg2T3N3?=
 =?utf-8?B?Q0UrUWFQak4yZkx2TUNzTE1FRjJoVHVhcWJ0TjZlazM3YlVLLzd3STJhdjl4?=
 =?utf-8?B?THFzYXNmN3VYWnpEY2VCTG5RTTdGSmwydXlLemsweEFGQzU0Wm5OYWR3U2Js?=
 =?utf-8?B?VGc4QWxuSkQ4Q2M0Qzc2TGlGSWtZbjB4Z3c2MXdaaW4wM2lSTEhrcDNwZ2pt?=
 =?utf-8?B?ajRKajFBNUU1Q1Zubmljd2F6RjV2UmFTaWs1NXkvVzMvRzAySTNiWEF0dENJ?=
 =?utf-8?B?b0xKV2kxL1BaU01UZnp6UWRhVFYzSm14aVJ3cDZtZlQrQVc5WmhvRGRwdG1m?=
 =?utf-8?B?TXRKYmo2UWdHQlMzTVZzQ1hhWlNzMm9KY3ZlaUppLzRDanRaM3NCME40eVNH?=
 =?utf-8?B?OGpTK0o4VENVdm9scjZGY2I0Y1kvdlhsbGJWdlB2QUhuVnFXMDJWMGpGaVM0?=
 =?utf-8?B?YkpLT1lpc001Vkpvdk5XNDNncVBiRzExcSt1UWkvdmJBQ0NweWRkRTIyci9C?=
 =?utf-8?B?M1cwcUUxbUVXazZvRnhoNWdoOXhQNjNXSlNpRlFDQXdMMGJkaFcxZFBxK0x0?=
 =?utf-8?B?OGc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e6877d91-4969-49c2-c793-08dbfa95e452
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 22:09:49.2268
 (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: CqOBUzTJewHEXVoqxNmQRkd9JhE7GGK1IN+Cf0kPCrGeRO+UY0LEBz/2xCAR3UB82wD9PylCBsf7N1QOxi6i5LhaJp7HtQvBjBEGA1yFFVE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8134
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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Mon, 11 Dec 2023 14:10:17 -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