Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
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 v2 1/3] drm/managed: Add drmm_release_action
Date:   Tue, 5 Dec 2023 02:22:08 +0100
Message-ID: <20231205012210.1491532-2-michal.winiarski@intel.com>
In-Reply-To: <20231205012210.1491532-1-michal.winiarski@intel.com>
References: <20231205012210.1491532-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?RlhmV1lkL1VYQ0FzeWl4K0VCaXJ0YThEZmlsUVA1VlR3YWFQNndibG5XcHBR?=
 =?utf-8?B?Y3lyVVAwQkU1L1JaNnd4Z1J5aUs2eFNjaTFQWklxWEl6Z3pqWDd4enIvR1R4?=
 =?utf-8?B?WjBQTkJtU3NmYm41TytOb3k0RzlyRlNJaEdMaURySnVUYjVLZ0J4UUk1d3oz?=
 =?utf-8?B?WXp4TU0xTGJqenV2SWJyUzdYUmxTUlczNnZESGZCc3B1UFZyc3ZxbG1kNEc4?=
 =?utf-8?B?WjRjZjR2UVFvcXc1SFF2RWkwQndpWWE2d0JuY3FYS09tWmh1SWNXTFd4czk2?=
 =?utf-8?B?QW1pNFRLMkhpdWEyK2QvWnhrMnJuQzEzZjAxQit0bmt5MEJyNDdwZEdKcHFo?=
 =?utf-8?B?WjBCb1hyck16b1JGWWpjVTIrbGp5eEhndHllYXRlZ3hUUXBZV0xkRG9nanUv?=
 =?utf-8?B?UjlEWkNpMHdnUWRCbStyaHE4TmtRYmYrNTZ5MDBhMTVDaWlPVm1PU3VEMUxz?=
 =?utf-8?B?WmhOU0xML1JrV2x2N2Z3UWFrY2JKRHp0czdpdmhSeTV3V0lOdVNpNXIzQ2RN?=
 =?utf-8?B?YXhrSzVOMkFjdkZHdXVoMnArZWs3MjUvRjg2eEdBRWZRb1k0TkQwcFZDeGlJ?=
 =?utf-8?B?clZUeHN4Y2pscFcrWlhvV0dFTG9PKzU3ZmN5cHJsSllSUWZnUE1FZ3Yrdkxz?=
 =?utf-8?B?YUYwN1RnSUpJZ29wc2FzcVdWTWtjc3RXRWpyQkdDK3RXWGtRenBvOVVzRFhn?=
 =?utf-8?B?UUluRS9mWGdXREhDa21ub2N4LzZyYjN6NnFFRTlaY1BjbUs4MWJXNzlVTjZ0?=
 =?utf-8?B?L1poN1dKYllqL1VEWFVsbitkc2ovZnp4cmZNQlhuNlgzd0lsY0xXLzBCWExQ?=
 =?utf-8?B?M2kzbGgrWDc2aFFTdm41OXJZZHJDVmpwM1AvMUplR0xDTW9YbXRYdUF1NDdP?=
 =?utf-8?B?K2Ztc0Y4WStLclZGby9UV1RtQitmOU1vVTRqSkl4TnlNMkVIVGJCVHN2ZkV4?=
 =?utf-8?B?R0FpTnFDRkxnTG9VNTJLTUJaek44dW5YODE4WUNoZW1ES3lNZ1NzUGczNUIz?=
 =?utf-8?B?NTRqYlN1bUxMcHFlZmpKN2Z1SzVhSmlaaGFmVWtqUzZHZUxic090QkdvVE5E?=
 =?utf-8?B?ZU82TVVIYStORXJid3NBZlp6cjg2c3F6bDVPc2ozMUNveHV0RlBYdUlpeFc2?=
 =?utf-8?B?SFNXQUorMjdxUjA5cVNyOGo3cTQ5RXd3UTNQUEdOTEpCZXF1TzlOK1pMeG95?=
 =?utf-8?B?NTI2Q3haWmx3T3Z4NVROQVRvZDI4UFVGL2g2bzJUTUIwWVVGalNMd2JaYXJw?=
 =?utf-8?B?c0U3cTNma0FQWnB0eFYxNEQ5Z3d2Y2Z4ZFRzWTFpQlRLYU5WWEZvWkJjUWJS?=
 =?utf-8?B?SnZrTnB5aEd2cjJBL3VTUEZZUFkvYjd0YWJtclI4ZHpvT3U2QnJBTzVRTzlC?=
 =?utf-8?B?bGZueVNYSEZmYThsODhhRkhLcWZ3RTYxRm8vUVBsaTBDazZwVy9BSXhvd1VM?=
 =?utf-8?B?YkU3eGZHVStnK1crd3VZZ1pRYUVCeFdPa0xnUVY5ZmZOT2xBT2NxNXVSakNH?=
 =?utf-8?B?d0ROa3NjN1BUc3FTckxSSndzd1prcXljNk80VzBsTWFxNUlSWUhvTkNFT3F5?=
 =?utf-8?B?Myt1OS9RNU9jM3JyVlNvc2F0MnpEY1VtOExFZWJVQlRXdnBiV0VWVGZXaGdz?=
 =?utf-8?B?Y2hGamhBWWdSNlhxZC9tSllpU2hpcmFJWE9kbGcyc1JZMk15WXU1V1JrTjR3?=
 =?utf-8?B?Y25uUXBaWFh0Nm9qYy9kbVk3UldZa2lZV1ZETW9MM1o1VnYvaE8vTGFGTzFy?=
 =?utf-8?B?NHFJNDZKUUFLdEtacG9Ma3VkRDZwckVPc2VlYnVPcnJ6ejYzQ1YvZXBwUi96?=
 =?utf-8?B?eld1dmxGdCtYUDJpT0xoK0xjNDMvRHI4ejVkVWNBZ1U4VDU0N1N1cWxGZXVq?=
 =?utf-8?B?eWdpTHVudkEwMCtQTDYxVCtMbDZoNWhxSFBEYXJwYzVXTEpMYUptcEZuZE8r?=
 =?utf-8?B?ZHpYUDdxUGdVSi9XdFV1eTFqTDlQM0lCRmtiVEFsZjdoTjNnYWVWYURKNFJ1?=
 =?utf-8?B?UDVjZ1I4b0Fvdk9scy9rWjBVOXloeE5tcXR3eVV5MWRmcE02WEx6MkpBY01I?=
 =?utf-8?B?S2VIMGpUL2FKVGJINGowdG5IZ1greVI5cWt6azdyVDd2UGNQWFpQSFFYQkhk?=
 =?utf-8?B?Y3dCamYzanRPOSt5RW5waDBlZklUY1c0eFFJbzFmMmMvZ0NSRDZSTGdKMVkr?=
 =?utf-8?B?VVE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e817bebe-8eed-4671-5363-08dbf530ad58
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2023 01:22:41.9900
 (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: stmUWHLHEIj1LzVZW/RIG/Xc/pQte28+MPBdEtctp5RaHGOelqjQIONDUBo9UrCTwMnNrd5/fKP9pkBUfYKoFoqK5e4FKj0jeJzD7GFa1Lw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7618
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 howler.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 (howler.vger.email [0.0.0.0]); Mon, 04 Dec 2023 17:22:58 -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