From: Daniel Vetter <daniel@ffwll.ch>
To: Ben Widawsky <ben@bwidawsk.net>
Cc: Intel GFX <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH] drm/i915: Don't use a special stolen reserve offset
Date: Fri, 5 Jul 2013 09:12:05 +0200 [thread overview]
Message-ID: <20130705071205.GR18285@phenom.ffwll.local> (raw)
In-Reply-To: <20130704212446.GQ18285@phenom.ffwll.local>
On Thu, Jul 04, 2013 at 11:24:46PM +0200, Daniel Vetter wrote:
> On Thu, Jul 04, 2013 at 12:42:15PM -0700, Ben Widawsky wrote:
> > Setting the node directly is good enough. We don't need a special value
> > to store the gtt_offset, and we no longer have the pointer to tuck
> > things away neatly.
> >
> > This is temporarily broken since:
> > commit 7dedae28b41000539b6c18bcf72107c97e4937e4
> > Author: Ben Widawsky <ben@bwidawsk.net>
> > Date: Wed Jul 3 14:45:24 2013 -0700
> >
> > drm/i915: Use gtt_space->start for stolen reservation
> >
> > However with no userspace currently, the bisection problem shouldn't be
> > a concern.
> >
> > CC: Chris Wilson <chris@chris-wilson.co.uk>
> > Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> > ---
> > drivers/gpu/drm/i915/i915_drv.h | 1 -
> > drivers/gpu/drm/i915/i915_gem_gtt.c | 1 -
> > drivers/gpu/drm/i915/i915_gem_stolen.c | 8 ++++++--
> > 3 files changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index ea86ad6..b9e8ba1 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -1201,7 +1201,6 @@ enum hdmi_force_audio {
> > HDMI_AUDIO_ON, /* force turn on HDMI audio */
> > };
> >
> > -#define I915_GTT_RESERVED (ULONG_MAX)
> > #define I915_GTT_OFFSET_NONE ((u32)-1)
> >
> > struct drm_i915_gem_object_ops {
> > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > index f075831..c0ca103 100644
> > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > @@ -632,7 +632,6 @@ void i915_gem_setup_global_gtt(struct drm_device *dev,
> > DRM_DEBUG_KMS("reserving preallocated space: %lx + %zx\n",
> > i915_gem_obj_ggtt_offset(obj), obj->base.size);
> >
> > - BUG_ON(obj->gtt_space->start != I915_GTT_RESERVED);
>
> I've thought we've agreed on a WARN_ON(!drm_mm_node_allocated); here?
WARN_ON(drm_mm_node_allocated); to be precise ;-)
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
next prev parent reply other threads:[~2013-07-05 7:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-04 19:42 [PATCH] drm/i915: Don't use a special stolen reserve offset Ben Widawsky
2013-07-04 21:24 ` Daniel Vetter
2013-07-05 7:12 ` Daniel Vetter [this message]
2013-07-05 19:12 ` Ben Widawsky
2013-07-05 19:22 ` Daniel Vetter
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=20130705071205.GR18285@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