From: Daniel Vetter <daniel@ffwll.ch>
To: Ben Widawsky <ben@bwidawsk.net>
Cc: Intel GFX <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 3/6] drm/i915: Kill obj->gtt_offset
Date: Thu, 4 Jul 2013 14:20:11 +0200 [thread overview]
Message-ID: <20130704122011.GA18285@phenom.ffwll.local> (raw)
In-Reply-To: <1372887926-1147-3-git-send-email-ben@bwidawsk.net>
On Wed, Jul 03, 2013 at 02:45:23PM -0700, Ben Widawsky wrote:
> With the getters in place from the previous patch this members serves no
> purpose other than saving one spare pointer chase, which will be killed
> in the next patch anyway.
>
> Moving to VMAs, this members adds unnecessary confusion since an object
> may exist at different offsets in different VMs.
>
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Ok, I've merged this and the previous patch to dinq (I'm stalling on the
first one until David's comments are addressed).
-Daniel
> ---
> drivers/gpu/drm/i915/i915_drv.h | 7 -------
> drivers/gpu/drm/i915/i915_gem.c | 2 --
> drivers/gpu/drm/i915/i915_gem_stolen.c | 1 -
> 3 files changed, 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 496ed3a..d06886b 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1328,13 +1328,6 @@ struct drm_i915_gem_object {
> unsigned long exec_handle;
> struct drm_i915_gem_exec_object2 *exec_entry;
>
> - /**
> - * Current offset of the object in GTT space.
> - *
> - * This is the same as gtt_space->start
> - */
> - uint32_t ggtt_offset;
> -
> struct intel_ring_buffer *ring;
>
> /** Breadcrumb of last rendering to the buffer. */
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index edd5b6d..e0568e3 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -2623,7 +2623,6 @@ i915_gem_object_unbind(struct drm_i915_gem_object *obj)
>
> drm_mm_put_block(obj->ggtt_space);
> obj->ggtt_space = NULL;
> - obj->ggtt_offset = 0;
>
> return 0;
> }
> @@ -3153,7 +3152,6 @@ search_free:
> list_add_tail(&obj->mm_list, &dev_priv->mm.inactive_list);
>
> obj->ggtt_space = node;
> - obj->ggtt_offset = node->start;
>
> fenceable =
> node->size == fence_size &&
> diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
> index cf0d0e0..2f009e6 100644
> --- a/drivers/gpu/drm/i915/i915_gem_stolen.c
> +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
> @@ -390,7 +390,6 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
> } else
> obj->ggtt_space = I915_GTT_RESERVED;
>
> - obj->ggtt_offset = gtt_offset;
> obj->has_global_gtt_mapping = 1;
>
> list_add_tail(&obj->global_list, &dev_priv->mm.bound_list);
> --
> 1.8.3.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
next prev parent reply other threads:[~2013-07-04 12:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-03 21:45 [PATCH 1/6] drm: pre allocate node for create_block Ben Widawsky
2013-07-03 21:45 ` [PATCH 2/6] drm/i915: Getter/setter for object attributes Ben Widawsky
2013-07-03 22:55 ` Daniel Vetter
2013-07-04 1:07 ` Ben Widawsky
2013-07-03 21:45 ` [PATCH 3/6] drm/i915: Kill obj->gtt_offset Ben Widawsky
2013-07-04 12:20 ` Daniel Vetter [this message]
2013-07-03 21:45 ` [PATCH 4/6] drm/i915: Use gtt_space->start for stolen reservation Ben Widawsky
2013-07-04 12:23 ` Daniel Vetter
2013-07-03 21:45 ` [PATCH 5/6] drm/i915: Embed drm_mm_node in i915 gem obj Ben Widawsky
2013-07-04 12:27 ` Daniel Vetter
2013-07-03 21:45 ` [PATCH 6/6] drm: Optionally create mm blocks from top-to-bottom Ben Widawsky
2013-07-04 9:19 ` [PATCH 1/6] drm: pre allocate node for create_block David Herrmann
2013-07-04 20:03 ` Ben Widawsky
2013-07-04 9:22 ` David Herrmann
2013-07-04 20:14 ` [PATCH] [v3] " Ben Widawsky
2013-07-04 20:32 ` David Herrmann
2013-07-05 19:25 ` Daniel Vetter
2013-07-05 19:44 ` Ben Widawsky
-- strict thread matches above, loose matches on Subject: below --
2016-03-19 9:31 [PATCH 3/6] drm/i915: Kill obj->gtt_offset Grant Carberry
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=20130704122011.GA18285@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=ben@bwidawsk.net \
--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