From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A314F348C52; Wed, 2 Sep 2026 06:57:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788332243; cv=none; b=FdPDjbW8Ns58pm6Fq3StzD6XocbbN6poTQzn6qm/geNC8BLuZwQufUCPMaidIe65mzpHWC9GzQ3UMT3DPlTqPy7nYwwCUkssRIcj1vGEOJZA+q+x0Qichw0N+FZLoe94CP8tLiUdEvnJYSGyKe3IxHjQhdvn0i9PAImROlfj1Xs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788332243; c=relaxed/simple; bh=/8D8GI7sA6QjK9hf+ayQELGZql6J95exiXf5ai5uFSk=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=h7fXbgkOlK3LPLMbzzft9GsOJNklJsjb4+czi6Y26NMNQ50j0OJyz/WWBWC1mlkeKGmEDaG5J2dQ6vInPbbgowGFRF42uX/sqPWhF7ggUaSL/zDi3yBn3ttIQKBCVjG7fl1JVr+hsxjvkeC3s2YZKjbvcR7Nf7VBrV6nmuV203Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=E3/J2U3U; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=XItB4gL8; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=C5dLl2nT; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=DVopmBd5; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="E3/J2U3U"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="XItB4gL8"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="C5dLl2nT"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="DVopmBd5" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id CED6D21F96; Wed, 2 Sep 2026 06:57:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788332233; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=hYWY2F7VOww6yUJfQcfpe/lLBEtZ+1DAKlHF2Nc2H/8=; b=E3/J2U3U27TEcWzv8WUeOq/k6Zif4bPTjT5q2vzeWtutZORc3kFTVi1ngMt3KM1gMpF49Y wA8mwYRzSygUmtD+1+A6w8Q0PHKd0s/v+EgpQA4MwY4K6TVL3cwJ1sq2lCRDLioaQys7rC SlNlU36S4GnhhY+FgvfDYrcmizj2dGE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788332233; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=hYWY2F7VOww6yUJfQcfpe/lLBEtZ+1DAKlHF2Nc2H/8=; b=XItB4gL8d4yiQsfRhYMZk7fdXHMYdapLEh5zeAKu9eku+HTuCD1WPCQPGus/DD5rBe9lDg vBFA6xC2LskW53Aw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=C5dLl2nT; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=DVopmBd5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788332228; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=hYWY2F7VOww6yUJfQcfpe/lLBEtZ+1DAKlHF2Nc2H/8=; b=C5dLl2nTD6xGkBlZrUR/TByuEX1EJ5GqhEkS42ru4ixT6IZPVMDblVo4sJH3OrohnuS2U8 0vnNURLhTHYHl3Pvr7ESvl7Q/Yr6qQawIVVXDWF6/v9/+wzDq8+OFwq8szCDi6CzmEkh2r 3TcCjsKLq7aW6NFCymQpNEAvC+LJzjs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788332228; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=hYWY2F7VOww6yUJfQcfpe/lLBEtZ+1DAKlHF2Nc2H/8=; b=DVopmBd5dLvPmmgJPVsuqMeCrzudgRMF/JWoxcuO0L2Lb+sYefZHrBbPIn2sujssjuW3NW 43u0OUFOe73qxuCw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 4443C136E6; Wed, 2 Sep 2026 06:57:08 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id rGezDMTIl2q6SQAAD6G6ig (envelope-from ); Wed, 02 Sep 2026 06:57:08 +0000 Message-ID: <69a37b53-82e1-40bb-8266-206c3bff6af2@suse.de> Date: Wed, 2 Sep 2026 08:57:07 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] drm/gem: Drop ticket arg to lru_scan() To: Rob Clark , dri-devel@lists.freedesktop.org Cc: Boris Brezillon , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , David Airlie , Simona Vetter , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , Steven Price , open list , "open list:DRM DRIVER for Qualcomm display hardware" , "open list:DRM DRIVER for Qualcomm display hardware" References: <20260901164544.642985-1-robin.clark@oss.qualcomm.com> Content-Language: en-US From: Thomas Zimmermann Autocrypt: addr=tzimmermann@suse.de; keydata= xsBNBFs50uABCADEHPidWt974CaxBVbrIBwqcq/WURinJ3+2WlIrKWspiP83vfZKaXhFYsdg XH47fDVbPPj+d6tQrw5lPQCyqjwrCPYnq3WlIBnGPJ4/jreTL6V+qfKRDlGLWFjZcsrPJGE0 BeB5BbqP5erN1qylK9i3gPoQjXGhpBpQYwRrEyQyjuvk+Ev0K1Jc5tVDeJAuau3TGNgah4Yc hdHm3bkPjz9EErV85RwvImQ1dptvx6s7xzwXTgGAsaYZsL8WCwDaTuqFa1d1jjlaxg6+tZsB 9GluwvIhSezPgnEmimZDkGnZRRSFiGP8yjqTjjWuf0bSj5rUnTGiyLyRZRNGcXmu6hjlABEB AAHNJ1Rob21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPsLAjgQTAQgAOAIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftODH AAoJEGgNwR1TC3ojx1wH/0hKGWugiqDgLNXLRD/4TfHBEKmxIrmfu9Z5t7vwUKfwhFL6hqvo lXPJJKQpQ2z8+X2vZm/slsLn7J1yjrOsoJhKABDi+3QWWSGkaGwRJAdPVVyJMfJRNNNIKwVb U6B1BkX2XDKDGffF4TxlOpSQzdtNI/9gleOoUA8+jy8knnDYzjBNOZqLG2FuTdicBXblz0Mf vg41gd9kCwYXDnD91rJU8tzylXv03E75NCaTxTM+FBXPmsAVYQ4GYhhgFt8S2UWMoaaABLDe 7l5FdnLdDEcbmd8uLU2CaG4W2cLrUaI4jz2XbkcPQkqTQ3EB67hYkjiEE6Zy3ggOitiQGcqp j//OwE0EWznS4AEIAMYmP4M/V+T5RY5at/g7rUdNsLhWv1APYrh9RQefODYHrNRHUE9eosYb T6XMryR9hT8XlGOYRwKWwiQBoWSDiTMo/Xi29jUnn4BXfI2px2DTXwc22LKtLAgTRjP+qbU6 3Y0xnQN29UGDbYgyyK51DW3H0If2a3JNsheAAK+Xc9baj0LGIc8T9uiEWHBnCH+RdhgATnWW GKdDegUR5BkDfDg5O/FISymJBHx2Dyoklv5g4BzkgqTqwmaYzsl8UxZKvbaxq0zbehDda8lv hFXodNFMAgTLJlLuDYOGLK2AwbrS3Sp0AEbkpdJBb44qVlGm5bApZouHeJ/+n+7r12+lqdsA EQEAAcLAdgQYAQgAIAIbDBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftOH6AAoJEGgNwR1T C3ojVSkIALpAPkIJPQoURPb1VWjh34l0HlglmYHvZszJWTXYwavHR8+k6Baa6H7ufXNQtThR yIxJrQLW6rV5lm7TjhffEhxVCn37+cg0zZ3j7zIsSS0rx/aMwi6VhFJA5hfn3T0TtrijKP4A SAQO9xD1Zk9/61JWk8OysuIh7MXkl0fxbRKWE93XeQBhIJHQfnc+YBLprdnxR446Sh8Wn/2D Ya8cavuWf2zrB6cZurs048xe0UbSW5AOSo4V9M0jzYI4nZqTmPxYyXbm30Kvmz0rYVRaitYJ 4kyYYMhuULvrJDMjZRvaNe52tkKAvMevcGdt38H4KSVXAylqyQOW5zvPc4/sq9c= In-Reply-To: <20260901164544.642985-1-robin.clark@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Level: X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: CED6D21F96 X-Spamd-Result: default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_TWELVE(0.00)[17]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[collabora.com,arm.com,linux.intel.com,kernel.org,gmail.com,ffwll.ch,linux.dev,poorly.run,somainline.org,vger.kernel.org,lists.freedesktop.org]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[arm.com:email,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.com:url,qualcomm.com:email,suse.de:dkim,suse.de:email,suse.de:mid]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Spam-Flag: NO X-Spam-Score: -4.51 Am 01.09.26 um 18:45 schrieb Rob Clark: > Commit 3392291fc509 ("drm/msm: Fix shrinker deadlock") dropped the only > use of the ticket arg, but at the time left drm_gem_lru_scan() unchanged > to avoid conflicts with in-flight panthor shrinker support. This commit > is the followup to remove the unused arg. > > Signed-off-by: Rob Clark > Reviewed-by: Boris Brezillon > Reviewed-by: Liviu Dudau Reviewed-by: Thomas Zimmermann > --- > > v2: Drop left over kerneldoc param description, fix panthor spelling > > drivers/gpu/drm/drm_gem.c | 14 +++----------- > drivers/gpu/drm/msm/msm_gem_shrinker.c | 22 ++++++++++------------ > drivers/gpu/drm/panthor/panthor_gem.c | 14 ++++++-------- > drivers/gpu/drm/panthor/panthor_mmu.c | 5 ++--- > drivers/gpu/drm/panthor/panthor_mmu.h | 3 +-- > include/drm/drm_gem.h | 3 +-- > 6 files changed, 23 insertions(+), 38 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c > index e3ed684ddcf2..3113b4a53b99 100644 > --- a/drivers/gpu/drm/drm_gem.c > +++ b/drivers/gpu/drm/drm_gem.c > @@ -1649,15 +1649,13 @@ EXPORT_SYMBOL(drm_gem_lru_move_tail); > * @nr_to_scan: The number of pages to try to reclaim > * @remaining: The number of pages left to reclaim, should be initialized by caller > * @shrink: Callback to try to shrink/reclaim the object. > - * @ticket: Optional ww_acquire_ctx context to use for locking > */ > unsigned long > drm_gem_lru_scan(struct drm_device *dev, > struct drm_gem_lru *lru, > unsigned int nr_to_scan, > unsigned long *remaining, > - bool (*shrink)(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket), > - struct ww_acquire_ctx *ticket) > + bool (*shrink)(struct drm_gem_object *obj)) > { > struct drm_gem_lru still_in_lru; > struct drm_gem_object *obj; > @@ -1690,20 +1688,17 @@ drm_gem_lru_scan(struct drm_device *dev, > */ > mutex_unlock(&dev->gem_lru_mutex); > > - if (ticket) > - ww_acquire_init(ticket, &reservation_ww_class); > - > /* > * Note that this still needs to be trylock, since we can > * hit shrinker in response to trying to get backing pages > * for this obj (ie. while it's lock is already held) > */ > - if (!ww_mutex_trylock(&obj->resv->lock, ticket)) { > + if (!ww_mutex_trylock(&obj->resv->lock, NULL)) { > *remaining += obj->size >> PAGE_SHIFT; > goto tail; > } > > - if (shrink(obj, ticket)) { > + if (shrink(obj)) { > freed += obj->size >> PAGE_SHIFT; > > /* > @@ -1727,9 +1722,6 @@ drm_gem_lru_scan(struct drm_device *dev, > > dma_resv_unlock(obj->resv); > > - if (ticket) > - ww_acquire_fini(ticket); > - > tail: > drm_gem_object_put(obj); > mutex_lock(&dev->gem_lru_mutex); > diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c > index 9d2788f79ace..3514d5c84989 100644 > --- a/drivers/gpu/drm/msm/msm_gem_shrinker.c > +++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c > @@ -102,7 +102,7 @@ with_vm_locks(void (*fn)(struct drm_gem_object *obj), > } > > static bool > -purge(struct drm_gem_object *obj, struct ww_acquire_ctx *unused) > +purge(struct drm_gem_object *obj) > { > if (!is_purgeable(to_msm_bo(obj))) > return false; > @@ -114,7 +114,7 @@ purge(struct drm_gem_object *obj, struct ww_acquire_ctx *unused) > } > > static bool > -evict(struct drm_gem_object *obj, struct ww_acquire_ctx *unused) > +evict(struct drm_gem_object *obj) > { > if (is_unevictable(to_msm_bo(obj))) > return false; > @@ -133,21 +133,21 @@ wait_for_idle(struct drm_gem_object *obj) > } > > static bool > -active_purge(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket) > +active_purge(struct drm_gem_object *obj) > { > if (!wait_for_idle(obj)) > return false; > > - return purge(obj, ticket); > + return purge(obj); > } > > static bool > -active_evict(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket) > +active_evict(struct drm_gem_object *obj) > { > if (!wait_for_idle(obj)) > return false; > > - return evict(obj, ticket); > + return evict(obj); > } > > static unsigned long > @@ -156,7 +156,7 @@ msm_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) > struct msm_drm_private *priv = shrinker->private_data; > struct { > struct drm_gem_lru *lru; > - bool (*shrink)(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket); > + bool (*shrink)(struct drm_gem_object *obj); > bool cond; > unsigned long freed; > unsigned long remaining; > @@ -180,8 +180,7 @@ msm_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) > stages[i].freed = > drm_gem_lru_scan(priv->dev, stages[i].lru, nr, > &stages[i].remaining, > - stages[i].shrink, > - NULL); > + stages[i].shrink); > nr -= stages[i].freed; > freed += stages[i].freed; > remaining += stages[i].remaining; > @@ -222,7 +221,7 @@ msm_gem_shrinker_shrink(struct drm_device *dev, unsigned long nr_to_scan) > static const int vmap_shrink_limit = 15; > > static bool > -vmap_shrink(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket) > +vmap_shrink(struct drm_gem_object *obj) > { > if (!is_vunmapable(to_msm_bo(obj))) > return false; > @@ -250,8 +249,7 @@ msm_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr) > unmapped += drm_gem_lru_scan(priv->dev, lrus[idx], > vmap_shrink_limit - unmapped, > &remaining, > - vmap_shrink, > - NULL); > + vmap_shrink); > } > > *(unsigned long *)ptr += unmapped; > diff --git a/drivers/gpu/drm/panthor/panthor_gem.c b/drivers/gpu/drm/panthor/panthor_gem.c > index 54535bae2b0c..17408f832af3 100644 > --- a/drivers/gpu/drm/panthor/panthor_gem.c > +++ b/drivers/gpu/drm/panthor/panthor_gem.c > @@ -1392,8 +1392,7 @@ panthor_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc) > return count ? count : SHRINK_EMPTY; > } > > -static bool panthor_gem_try_evict_no_resv_wait(struct drm_gem_object *obj, > - struct ww_acquire_ctx *ticket) > +static bool panthor_gem_try_evict_no_resv_wait(struct drm_gem_object *obj) > { > /* > * Track last locked entry for unwinding locks in error and > @@ -1479,8 +1478,7 @@ static bool panthor_gem_try_evict_no_resv_wait(struct drm_gem_object *obj, > return ret == 0; > } > > -static bool panthor_gem_try_evict(struct drm_gem_object *obj, > - struct ww_acquire_ctx *ticket) > +static bool panthor_gem_try_evict(struct drm_gem_object *obj) > { > struct panthor_gem_object *bo = to_panthor_bo(obj); > > @@ -1488,7 +1486,7 @@ static bool panthor_gem_try_evict(struct drm_gem_object *obj, > if (dma_resv_wait_timeout(obj->resv, DMA_RESV_USAGE_BOOKKEEP, false, 10) <= 0) > return false; > > - return panthor_gem_try_evict_no_resv_wait(&bo->base, ticket); > + return panthor_gem_try_evict_no_resv_wait(&bo->base); > } > > static unsigned long > @@ -1503,13 +1501,13 @@ panthor_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) > > freed += drm_gem_lru_scan(&ptdev->base, &ptdev->reclaim.unused, > sc->nr_to_scan - freed, &remaining, > - panthor_gem_try_evict_no_resv_wait, NULL); > + panthor_gem_try_evict_no_resv_wait); > if (freed >= sc->nr_to_scan) > goto out; > > freed += drm_gem_lru_scan(&ptdev->base, &ptdev->reclaim.mmapped, > sc->nr_to_scan - freed, &remaining, > - panthor_gem_try_evict_no_resv_wait, NULL); > + panthor_gem_try_evict_no_resv_wait); > if (freed >= sc->nr_to_scan) > goto out; > > @@ -1523,7 +1521,7 @@ panthor_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) > > freed += drm_gem_lru_scan(&ptdev->base, &ptdev->reclaim.gpu_mapped_shared, > sc->nr_to_scan - freed, &remaining, > - panthor_gem_try_evict, NULL); > + panthor_gem_try_evict); > > out: > #ifdef CONFIG_DEBUG_FS > diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c > index e10dbd18d8cf..ab070bc74857 100644 > --- a/drivers/gpu/drm/panthor/panthor_mmu.c > +++ b/drivers/gpu/drm/panthor/panthor_mmu.c > @@ -3133,8 +3133,7 @@ int panthor_vm_prepare_mapped_bos_resvs(struct drm_exec *exec, struct panthor_vm > unsigned long > panthor_mmu_reclaim_priv_bos(struct panthor_device *ptdev, > unsigned int nr_to_scan, unsigned long *remaining, > - bool (*shrink)(struct drm_gem_object *, > - struct ww_acquire_ctx *)) > + bool (*shrink)(struct drm_gem_object *)) > { > unsigned long freed = 0; > LIST_HEAD(remaining_vms); > @@ -3160,7 +3159,7 @@ panthor_mmu_reclaim_priv_bos(struct panthor_device *ptdev, > > freed += drm_gem_lru_scan(&ptdev->base, &vm->reclaim.lru, > nr_to_scan - freed, > - remaining, shrink, NULL); > + remaining, shrink); > > mutex_lock(&ptdev->base.gem_lru_mutex); > > diff --git a/drivers/gpu/drm/panthor/panthor_mmu.h b/drivers/gpu/drm/panthor/panthor_mmu.h > index 3522fbbce369..abc36e7204be 100644 > --- a/drivers/gpu/drm/panthor/panthor_mmu.h > +++ b/drivers/gpu/drm/panthor/panthor_mmu.h > @@ -52,8 +52,7 @@ int panthor_vm_evict_bo_mappings_locked(struct panthor_gem_object *bo); > unsigned long > panthor_mmu_reclaim_priv_bos(struct panthor_device *ptdev, > unsigned int nr_to_scan, unsigned long *remaining, > - bool (*shrink)(struct drm_gem_object *, > - struct ww_acquire_ctx *)); > + bool (*shrink)(struct drm_gem_object *)); > int panthor_vm_prepare_mapped_bos_resvs(struct drm_exec *exec, > struct panthor_vm *vm, > u32 slot_count); > diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h > index 8a704f6a65c1..ffa607c91aa2 100644 > --- a/include/drm/drm_gem.h > +++ b/include/drm/drm_gem.h > @@ -616,8 +616,7 @@ drm_gem_lru_scan(struct drm_device *dev, > struct drm_gem_lru *lru, > unsigned int nr_to_scan, > unsigned long *remaining, > - bool (*shrink)(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket), > - struct ww_acquire_ctx *ticket); > + bool (*shrink)(struct drm_gem_object *obj)); > > int drm_gem_evict_locked(struct drm_gem_object *obj); > -- -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com GF: Jochen Jaser, Andrew McDonald, (HRB 36809, AG Nürnberg)