From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 331AA45C14 for ; Fri, 27 Dec 2024 11:40:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735299661; cv=none; b=MbF4AiFnykyqUl51S4dq70OMGrXmFbyQ389v228DNyYhvRP7kG6QLvevC0bOJFFV4FrDVRFykKQm0GCRf1R3RS3LqvFh5+06K5rz07nLxa+dtagJQgYgbjoxXtvp3tbO1om3StJHcvzdIs9H6p2Zw8OXIZUBbYJRAPVf2H8XbkU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735299661; c=relaxed/simple; bh=aMOtTWT2gvuaN+GZpPXKT24M0t6PloFDWYXl8hLmfkc=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=N4aaMyyznzLB2L6IC/OfmEw5+94HW8FA789NLXjXzXNf5X///alsIdQzKNqHW8mEvzNFIuvQ6jjzcv7y21pcITFEBTc0htessrwTSqAFAaDOyMQuG2yojnGIbu2wUczOZbP1AysZ5m0r4NtcE1Ecyye2xoywonWD7T2aaAtyn88= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ursulin.net; spf=none smtp.mailfrom=ursulin.net; dkim=pass (2048-bit key) header.d=ursulin-net.20230601.gappssmtp.com header.i=@ursulin-net.20230601.gappssmtp.com header.b=owykZjgB; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ursulin.net Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ursulin.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ursulin-net.20230601.gappssmtp.com header.i=@ursulin-net.20230601.gappssmtp.com header.b="owykZjgB" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-43622267b2eso75754485e9.0 for ; Fri, 27 Dec 2024 03:40:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20230601.gappssmtp.com; s=20230601; t=1735299657; x=1735904457; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=VIaep5T6NY0/n739vSbFSbNZrH0/PX3pv3s3aQMDhrg=; b=owykZjgBxNriIwiSm1NjrSNcI6vHW+6fpq8NHuzJ8IwOl+8U+5DM6UTARIFmQ4OkgB lJahHKCZsXDwzCW9nDXzFdYW9Gy7W6wi4/S6vPTOiSlJOFUFOR8YlnLvjNmovrxYJH8t BfKYIgHrgnn5Lk66UlpKTQGhL2ADRzJbj23YEIEVxwQVALafYWTtclQr7p09FxaQ6IjI y1j0s5WexstMpuX8qco4nkreXk84YbD6ltxhtV/EZx/Bk6+DGQJ5knW9n1xTxuhY+0wH SbaSuq86zSyJGp2SVcJyz1Pvj/HvNqyvBBlxk5Sk6GqDRr095BpKLLuedwp25utXCBSF TB9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735299657; x=1735904457; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VIaep5T6NY0/n739vSbFSbNZrH0/PX3pv3s3aQMDhrg=; b=ZhNkGP3L9kj+9AdVrvXnQcJAsPdOaz7JI3Rbwa+uVCG5/k/dvugvZtmQYcty682Ftn e9Mxs+v49U5Vn0iEFDsK2e9DE3ep7qqwZfQ3a8usSQY9UldjC827feAY6b9L7q5Gxzh+ CrtgNmYfrZfWUlocm5nuGaqmqcFhYfn50em+899UdbDoXTrMzMik6khiO46gVFFg43v5 kkRoGlbG92m2+Y/4N6cqEnyHbhdqdNypKEPBcMqP2tqpBJuJqPIZxhGwWsq59fGSa9kN cverd16/2N48bU8ednIyuRvlghxIl5/ckZ/hQ7HxXdk06xlj3xt3rQySsHlQSL45DW/s T+4w== X-Forwarded-Encrypted: i=1; AJvYcCVYALwmb6OWVIXACz0rJ7Lb4dyN0rGI9SML63UvMnn6feRSZzv7PiP5YAIGmMId6h37WrtfGmp6oUTFu/E=@vger.kernel.org X-Gm-Message-State: AOJu0Yw8rPn0OqrkAnTYLbVxNTf5bzPaqegrlaGYYsbSUSUM75XEOW2i zwXOmGa5Ah89KJ1JYPJDxmsylW5PWp5YnC2bijelPWI6KSR3l9PhGGADb/HAKW8= X-Gm-Gg: ASbGnctXzZc0evIk8nc9R11nGOP6omm69TdGFoh9lZ6P0SxoXIOoAgbkgWHCSqow3Ie 75DZKwSJtTXoId0WNMdQCMDX4GLyK31yxuDWxM47a1/3PiDd2NeVGjS9OHGnZv+aJ1bMc7ZRsuX UturV/ilsUZ0+qhc0ofZYC+A/2Ih4HRBQs56rkkUhrGUqy7Jg784NsTPyq0hcSQi1GdM5iK5mTI 1v0/7gzRWqsbzRtyDNTDOYdtTtRPLTvOmMH961lSD13uPnL4qtHuWXeWItEndfjOS9j+F37 X-Google-Smtp-Source: AGHT+IFf9GNUkc9MTznSwG6dDejiwNWG3QzfVu5TaVwHwy7s5MZGB7ZkWntkV4PytcaeIFoLNdsfUA== X-Received: by 2002:a5d:6d8b:0:b0:386:3356:f3ac with SMTP id ffacd0b85a97d-38a221f2dedmr24035382f8f.26.1735299657278; Fri, 27 Dec 2024 03:40:57 -0800 (PST) Received: from [192.168.0.101] ([90.241.98.187]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a2432e587sm18713521f8f.95.2024.12.27.03.40.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 Dec 2024 03:40:56 -0800 (PST) Message-ID: Date: Fri, 27 Dec 2024 11:40:56 +0000 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] drm/i915: Remove deadcode To: linux@treblig.org, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, intel-gfx@lists.freedesktop.org Cc: airlied@gmail.com, simona@ffwll.ch, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20241222174751.222975-1-linux@treblig.org> Content-Language: en-GB From: Tvrtko Ursulin In-Reply-To: <20241222174751.222975-1-linux@treblig.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, On 22/12/2024 17:47, linux@treblig.org wrote: > From: "Dr. David Alan Gilbert" > > i915_active_acquire_for_context() was added in 2020 by > commit 5d9341370f57 ("drm/i915: Export a preallocate variant of > i915_active_acquire()") but has never been used. > > The last use of __i915_gem_object_is_lmem() was removed in 2021 by > commit ff20afc4cee7 ("drm/i915: Update error capture code to avoid using > the current vma state") > > Remove them. I plan to apply this and your other two dead code removal patches. I needed to re-send to the mailing list first so they get picked up by the CI before I can do that (I guess you are not subscribed to intel-gfx). It should happen in a day or two. Thanks for the cleanup! Regards, Tvrtko > Signed-off-by: Dr. David Alan Gilbert > --- > drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 23 ----------------------- > drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 2 -- > drivers/gpu/drm/i915/i915_active.c | 18 ------------------ > drivers/gpu/drm/i915/i915_active.h | 1 - > 4 files changed, 44 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c > index 3198b64ad7db..388f90784d8a 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c > @@ -52,29 +52,6 @@ bool i915_gem_object_is_lmem(struct drm_i915_gem_object *obj) > mr->type == INTEL_MEMORY_STOLEN_LOCAL); > } > > -/** > - * __i915_gem_object_is_lmem - Whether the object is resident in > - * lmem while in the fence signaling critical path. > - * @obj: The object to check. > - * > - * This function is intended to be called from within the fence signaling > - * path where the fence, or a pin, keeps the object from being migrated. For > - * example during gpu reset or similar. > - * > - * Return: Whether the object is resident in lmem. > - */ > -bool __i915_gem_object_is_lmem(struct drm_i915_gem_object *obj) > -{ > - struct intel_memory_region *mr = READ_ONCE(obj->mm.region); > - > -#ifdef CONFIG_LOCKDEP > - GEM_WARN_ON(dma_resv_test_signaled(obj->base.resv, DMA_RESV_USAGE_BOOKKEEP) && > - i915_gem_object_evictable(obj)); > -#endif > - return mr && (mr->type == INTEL_MEMORY_LOCAL || > - mr->type == INTEL_MEMORY_STOLEN_LOCAL); > -} > - > /** > * __i915_gem_object_create_lmem_with_ps - Create lmem object and force the > * minimum page size for the backing pages. > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.h b/drivers/gpu/drm/i915/gem/i915_gem_lmem.h > index 5a7a14e85c3f..ecd8f1a633a1 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.h > @@ -19,8 +19,6 @@ i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj, > > bool i915_gem_object_is_lmem(struct drm_i915_gem_object *obj); > > -bool __i915_gem_object_is_lmem(struct drm_i915_gem_object *obj); > - > struct drm_i915_gem_object * > i915_gem_object_create_lmem_from_data(struct drm_i915_private *i915, > const void *data, size_t size); > diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c > index 35319228bc51..0dbc4e289300 100644 > --- a/drivers/gpu/drm/i915/i915_active.c > +++ b/drivers/gpu/drm/i915/i915_active.c > @@ -527,24 +527,6 @@ int i915_active_acquire(struct i915_active *ref) > return err; > } > > -int i915_active_acquire_for_context(struct i915_active *ref, u64 idx) > -{ > - struct i915_active_fence *active; > - int err; > - > - err = i915_active_acquire(ref); > - if (err) > - return err; > - > - active = active_instance(ref, idx); > - if (!active) { > - i915_active_release(ref); > - return -ENOMEM; > - } > - > - return 0; /* return with active ref */ > -} > - > void i915_active_release(struct i915_active *ref) > { > debug_active_assert(ref); > diff --git a/drivers/gpu/drm/i915/i915_active.h b/drivers/gpu/drm/i915/i915_active.h > index 77c676ecc263..821f7c21ea9b 100644 > --- a/drivers/gpu/drm/i915/i915_active.h > +++ b/drivers/gpu/drm/i915/i915_active.h > @@ -186,7 +186,6 @@ int i915_request_await_active(struct i915_request *rq, > #define I915_ACTIVE_AWAIT_BARRIER BIT(2) > > int i915_active_acquire(struct i915_active *ref); > -int i915_active_acquire_for_context(struct i915_active *ref, u64 idx); > bool i915_active_acquire_if_busy(struct i915_active *ref); > > void i915_active_release(struct i915_active *ref);