From: Jason Ekstrand <jason@jlekstrand.net>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Jason Ekstrand <jason@jlekstrand.net>
Subject: [PATCH 23/31] drm/i915/gt: Drop i915_address_space::file (v2)
Date: Tue, 8 Jun 2021 23:36:05 -0500 [thread overview]
Message-ID: <20210609043613.102962-24-jason@jlekstrand.net> (raw)
In-Reply-To: <20210609043613.102962-1-jason@jlekstrand.net>
There's a big comment saying how useful it is but no one is using this
for anything anymore.
It was added in 2bfa996e031b ("drm/i915: Store owning file on the
i915_address_space") and used for debugfs at the time as well as telling
the difference between the global GTT and a PPGTT. In f6e8aa387171
("drm/i915: Report the number of closed vma held by each context in
debugfs") we removed one use of it by switching to a context walk and
comparing with the VM in the context. Finally, VM stats for debugfs
were entirely nuked in db80a1294c23 ("drm/i915/gem: Remove per-client
stats from debugfs/i915_gem_objects")
v2 (Daniel Vetter):
- Delete a struct drm_i915_file_private pre-declaration
- Add a comment to the commit message about history
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/gem/i915_gem_context.c | 9 ---------
drivers/gpu/drm/i915/gt/intel_gtt.h | 11 -----------
drivers/gpu/drm/i915/selftests/mock_gtt.c | 1 -
3 files changed, 21 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index 7045e3afa7113..5a1402544d48d 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -1453,17 +1453,10 @@ static int gem_context_register(struct i915_gem_context *ctx,
u32 *id)
{
struct drm_i915_private *i915 = ctx->i915;
- struct i915_address_space *vm;
int ret;
ctx->file_priv = fpriv;
- mutex_lock(&ctx->mutex);
- vm = i915_gem_context_vm(ctx);
- if (vm)
- WRITE_ONCE(vm->file, fpriv); /* XXX */
- mutex_unlock(&ctx->mutex);
-
ctx->pid = get_task_pid(current, PIDTYPE_PID);
snprintf(ctx->name, sizeof(ctx->name), "%s[%d]",
current->comm, pid_nr(ctx->pid));
@@ -1562,8 +1555,6 @@ int i915_gem_vm_create_ioctl(struct drm_device *dev, void *data,
if (IS_ERR(ppgtt))
return PTR_ERR(ppgtt);
- ppgtt->vm.file = file_priv;
-
if (args->extensions) {
err = i915_user_extensions(u64_to_user_ptr(args->extensions),
NULL, 0,
diff --git a/drivers/gpu/drm/i915/gt/intel_gtt.h b/drivers/gpu/drm/i915/gt/intel_gtt.h
index edea95b97c36e..474eae483ab0e 100644
--- a/drivers/gpu/drm/i915/gt/intel_gtt.h
+++ b/drivers/gpu/drm/i915/gt/intel_gtt.h
@@ -140,7 +140,6 @@ typedef u64 gen8_pte_t;
enum i915_cache_level;
-struct drm_i915_file_private;
struct drm_i915_gem_object;
struct i915_fence_reg;
struct i915_vma;
@@ -220,16 +219,6 @@ struct i915_address_space {
struct intel_gt *gt;
struct drm_i915_private *i915;
struct device *dma;
- /*
- * Every address space belongs to a struct file - except for the global
- * GTT that is owned by the driver (and so @file is set to NULL). In
- * principle, no information should leak from one context to another
- * (or between files/processes etc) unless explicitly shared by the
- * owner. Tracking the owner is important in order to free up per-file
- * objects along with the file, to aide resource tracking, and to
- * assign blame.
- */
- struct drm_i915_file_private *file;
u64 total; /* size addr space maps (ex. 2GB for ggtt) */
u64 reserved; /* size addr space reserved */
diff --git a/drivers/gpu/drm/i915/selftests/mock_gtt.c b/drivers/gpu/drm/i915/selftests/mock_gtt.c
index 5c7ae40bba634..cc047ec594f93 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gtt.c
@@ -73,7 +73,6 @@ struct i915_ppgtt *mock_ppgtt(struct drm_i915_private *i915, const char *name)
ppgtt->vm.gt = &i915->gt;
ppgtt->vm.i915 = i915;
ppgtt->vm.total = round_down(U64_MAX, PAGE_SIZE);
- ppgtt->vm.file = ERR_PTR(-ENODEV);
ppgtt->vm.dma = i915->drm.dev;
i915_address_space_init(&ppgtt->vm, VM_CLASS_PPGTT);
--
2.31.1
next prev parent reply other threads:[~2021-06-09 4:37 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 4:35 [PATCH 00/31] drm/i915/gem: ioctl clean-ups (v6) Jason Ekstrand
2021-06-09 4:35 ` [PATCH 01/31] drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE Jason Ekstrand
2021-06-09 4:35 ` [PATCH 02/31] drm/i915: Stop storing the ring size in the ring pointer (v2) Jason Ekstrand
2021-06-09 4:35 ` [PATCH 03/31] drm/i915: Drop I915_CONTEXT_PARAM_NO_ZEROMAP Jason Ekstrand
2021-06-09 4:35 ` [PATCH 04/31] drm/i915/gem: Set the watchdog timeout directly in intel_context_set_gem (v2) Jason Ekstrand
2021-06-09 4:35 ` [PATCH 05/31] drm/i915/gem: Return void from context_apply_all Jason Ekstrand
2021-06-09 4:35 ` [PATCH 06/31] drm/i915: Drop the CONTEXT_CLONE API (v2) Jason Ekstrand
2021-06-09 4:35 ` [PATCH 07/31] drm/i915: Implement SINGLE_TIMELINE with a syncobj (v4) Jason Ekstrand
2021-06-09 4:35 ` [PATCH 08/31] drm/i915: Drop getparam support for I915_CONTEXT_PARAM_ENGINES Jason Ekstrand
2021-06-09 4:35 ` [PATCH 09/31] drm/i915/gem: Disallow bonding of virtual engines (v3) Jason Ekstrand
2021-06-09 4:35 ` [PATCH 10/31] drm/i915/gem: Remove engine auto-magic with FENCE_SUBMIT (v2) Jason Ekstrand
2021-06-09 4:35 ` [PATCH 11/31] drm/i915/request: Remove the hook from await_execution Jason Ekstrand
2021-06-09 4:35 ` [PATCH 12/31] drm/i915/gem: Disallow creating contexts with too many engines Jason Ekstrand
2021-06-09 4:35 ` [PATCH 13/31] drm/i915: Stop manually RCU banging in reset_stats_ioctl (v2) Jason Ekstrand
2021-06-09 4:35 ` [PATCH 14/31] drm/i915/gem: Add a separate validate_priority helper Jason Ekstrand
2021-06-09 4:35 ` [PATCH 15/31] drm/i915: Add gem/i915_gem_context.h to the docs Jason Ekstrand
2021-06-09 4:35 ` [PATCH 16/31] drm/i915/gem: Add an intermediate proto_context struct (v4) Jason Ekstrand
2021-06-09 11:28 ` [Intel-gfx] " Daniel Vetter
2021-06-09 16:00 ` Jason Ekstrand
2021-06-10 16:44 ` Daniel Vetter
2021-06-10 16:53 ` Jason Ekstrand
2021-06-09 4:35 ` [PATCH 17/31] drm/i915/gem: Rework error handling in default_engines Jason Ekstrand
2021-06-09 4:36 ` [PATCH 18/31] drm/i915/gem: Optionally set SSEU in intel_context_set_gem Jason Ekstrand
2021-06-09 4:36 ` [PATCH 19/31] drm/i915: Add an i915_gem_vm_lookup helper Jason Ekstrand
2021-06-09 4:36 ` [PATCH 20/31] drm/i915/gem: Make an alignment check more sensible Jason Ekstrand
2021-06-09 4:36 ` [PATCH 21/31] drm/i915/gem: Use the proto-context to handle create parameters (v3) Jason Ekstrand
2021-06-09 4:36 ` [PATCH 22/31] drm/i915/gem: Return an error ptr from context_lookup Jason Ekstrand
2021-06-09 4:36 ` Jason Ekstrand [this message]
2021-06-09 4:36 ` [PATCH 24/31] drm/i915/gem: Delay context creation (v2) Jason Ekstrand
2021-06-09 8:25 ` [Intel-gfx] " kernel test robot
2021-06-09 11:38 ` kernel test robot
2021-06-09 11:44 ` kernel test robot
2021-06-09 4:36 ` [PATCH 25/31] drm/i915/gem: Don't allow changing the VM on running contexts (v2) Jason Ekstrand
2021-06-09 7:39 ` [Intel-gfx] " kernel test robot
2021-06-09 11:34 ` Daniel Vetter
2021-06-09 11:34 ` Daniel Vetter
2021-06-09 16:06 ` Jason Ekstrand
2021-06-09 4:36 ` [PATCH 26/31] drm/i915/gem: Don't allow changing the engine set " Jason Ekstrand
2021-06-09 4:36 ` [PATCH 27/31] drm/i915/selftests: Take a VM in kernel_context() Jason Ekstrand
2021-06-09 4:36 ` [PATCH 28/31] i915/gem/selftests: Assign the VM at context creation in igt_shared_ctx_exec Jason Ekstrand
2021-06-09 4:36 ` [PATCH 29/31] drm/i915/gem: Roll all of context creation together Jason Ekstrand
2021-06-09 4:36 ` [PATCH 30/31] drm/i915: Finalize contexts in GEM_CONTEXT_CREATE on version 13+ Jason Ekstrand
2021-06-09 10:13 ` [Intel-gfx] " kernel test robot
2021-06-09 11:38 ` Daniel Vetter
2021-06-09 4:36 ` [PATCH 31/31] drm/i915: Drop some RCU usage around context VMs Jason Ekstrand
2021-06-09 11:41 ` [Intel-gfx] " Daniel Vetter
2021-06-09 16:07 ` Jason Ekstrand
-- strict thread matches above, loose matches on Subject: below --
2021-06-09 17:43 [PATCH 00/31] drm/i915/gem: ioctl clean-ups (v6) Jason Ekstrand
2021-06-09 17:44 ` [PATCH 23/31] drm/i915/gt: Drop i915_address_space::file (v2) Jason Ekstrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210609043613.102962-24-jason@jlekstrand.net \
--to=jason@jlekstrand.net \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).