Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 09/22] drm/i915: Nuke arguments to eb_pin_engine
Date: Mon, 30 Mar 2020 16:35:32 +0200	[thread overview]
Message-ID: <20200330143545.4371-9-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20200330143545.4371-1-maarten.lankhorst@linux.intel.com>

Those arguments are already set as eb.file and eb.args, so kill off
the extra arguments. This will allow us to move eb_pin_engine() to
after we reserved all BO's.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index a337f3054ce3..74146623b8ae 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -2412,11 +2412,10 @@ static void eb_unpin_engine(struct i915_execbuffer *eb)
 }
 
 static unsigned int
-eb_select_legacy_ring(struct i915_execbuffer *eb,
-		      struct drm_file *file,
-		      struct drm_i915_gem_execbuffer2 *args)
+eb_select_legacy_ring(struct i915_execbuffer *eb)
 {
 	struct drm_i915_private *i915 = eb->i915;
+	struct drm_i915_gem_execbuffer2 *args = eb->args;
 	unsigned int user_ring_id = args->flags & I915_EXEC_RING_MASK;
 
 	if (user_ring_id != I915_EXEC_BSD &&
@@ -2431,7 +2430,7 @@ eb_select_legacy_ring(struct i915_execbuffer *eb,
 		unsigned int bsd_idx = args->flags & I915_EXEC_BSD_MASK;
 
 		if (bsd_idx == I915_EXEC_BSD_DEFAULT) {
-			bsd_idx = gen8_dispatch_bsd_engine(i915, file);
+			bsd_idx = gen8_dispatch_bsd_engine(i915, eb->file);
 		} else if (bsd_idx >= I915_EXEC_BSD_RING1 &&
 			   bsd_idx <= I915_EXEC_BSD_RING2) {
 			bsd_idx >>= I915_EXEC_BSD_SHIFT;
@@ -2456,18 +2455,16 @@ eb_select_legacy_ring(struct i915_execbuffer *eb,
 }
 
 static int
-eb_pin_engine(struct i915_execbuffer *eb,
-	      struct drm_file *file,
-	      struct drm_i915_gem_execbuffer2 *args)
+eb_pin_engine(struct i915_execbuffer *eb)
 {
 	struct intel_context *ce;
 	unsigned int idx;
 	int err;
 
 	if (i915_gem_context_user_engines(eb->gem_context))
-		idx = args->flags & I915_EXEC_RING_MASK;
+		idx = eb->args->flags & I915_EXEC_RING_MASK;
 	else
-		idx = eb_select_legacy_ring(eb, file, args);
+		idx = eb_select_legacy_ring(eb);
 
 	ce = i915_gem_context_get_engine(eb->gem_context, idx);
 	if (IS_ERR(ce))
@@ -2765,7 +2762,7 @@ i915_gem_do_execbuffer(struct drm_device *dev,
 	if (unlikely(err))
 		goto err_destroy;
 
-	err = eb_pin_engine(&eb, file, args);
+	err = eb_pin_engine(&eb);
 	if (unlikely(err))
 		goto err_context;
 
-- 
2.25.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2020-03-30 14:36 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-30 14:35 [Intel-gfx] [PATCH 01/22] Revert "drm/i915/gem: Drop relocation slowpath" Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 02/22] perf/core: Only copy-to-user after completely unlocking all locks. (CI test) Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 03/22] drm/i915: Add an implementation for i915_gem_ww_ctx locking, v2 Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 04/22] drm/i915: Remove locking from i915_gem_object_prepare_read/write Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 05/22] drm/i915: Parse command buffer earlier in eb_relocate(slow) Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 06/22] drm/i915: Use per object locking in execbuf, v7 Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 07/22] drm/i915: Use ww locking in intel_renderstate Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 08/22] drm/i915: Add ww context handling to context_barrier_task Maarten Lankhorst
2020-03-30 14:35 ` Maarten Lankhorst [this message]
2020-03-30 14:35 ` [Intel-gfx] [PATCH 10/22] drm/i915: Pin engine before pinning all objects, v3 Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 11/22] drm/i915: Rework intel_context pinning to do everything outside of pin_mutex Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 12/22] drm/i915: Make sure execbuffer always passes ww state to i915_vma_pin Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 13/22] drm/i915: Convert i915_gem_object/client_blt.c to use ww locking as well, v2 Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 14/22] drm/i915: Kill last user of intel_context_create_request outside of selftests Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 15/22] drm/i915: Convert i915_perf to ww locking as well Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 16/22] drm/i915: Dirty hack to fix selftests locking inversion Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 17/22] drm/i915/selftests: Fix locking inversion in lrc selftest Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 18/22] drm/i915: Use ww pinning for intel_context_create_request() Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 19/22] drm/i915: Move i915_vma_lock in the selftests to avoid lock inversion, v2 Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 20/22] drm/i915: Add ww locking to vm_fault_gtt Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 21/22] drm/i915: Add ww locking to pin_to_display_plane Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 22/22] drm/i915: Ensure we hold the pin mutex Maarten Lankhorst
2020-03-30 20:37 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [01/22] Revert "drm/i915/gem: Drop relocation slowpath" Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2020-03-30 14:09 [Intel-gfx] [PATCH 01/22] " Maarten Lankhorst
2020-03-30 14:09 ` [Intel-gfx] [PATCH 09/22] drm/i915: Nuke arguments to eb_pin_engine Maarten Lankhorst

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=20200330143545.4371-9-maarten.lankhorst@linux.intel.com \
    --to=maarten.lankhorst@linux.intel.com \
    --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