From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v4] drm/i915: Add null state batch to active list Date: Thu, 22 May 2014 14:10:59 +0200 Message-ID: <20140522121059.GR14357@phenom.ffwll.local> References: <20140521151759.GL14357@phenom.ffwll.local> <1400688066-3452-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ee0-f51.google.com (mail-ee0-f51.google.com [74.125.83.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 736456EBBD for ; Thu, 22 May 2014 05:11:04 -0700 (PDT) Received: by mail-ee0-f51.google.com with SMTP id e51so2557321eek.10 for ; Thu, 22 May 2014 05:11:03 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1400688066-3452-1-git-send-email-mika.kuoppala@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Mika Kuoppala Cc: intel-gfx@lists.freedesktop.org, miku@iki.fi List-Id: intel-gfx@lists.freedesktop.org On Wed, May 21, 2014 at 07:01:06PM +0300, Mika Kuoppala wrote: > From: Mika Kuoppala > = > for proper refcounting to take place as we use > i915_add_request() for it. > = > i915_add_request() also takes the context for the request > from ring->last_context so move the null state batch > submission after the ring context has been set. > = > v2: we need to check for correct ring now (Ville Syrj=E4l=E4) > v3: no need to expose i915_gem_move_object_to_active (Chris Wilson) > v4: cargoculted vma/active/inactive error handling removed (Chris Wilson) > = > Cc: Ville Syrj=E4l=E4 > Cc: Chris Wilson > Cc: Damien Lespiau > Signed-off-by: Mika Kuoppala > Signed-off-by: Daniel Vetter Ok, merged instead of v3 with Chris' irc r-b. Thanks, Daniel > --- > drivers/gpu/drm/i915/i915_gem_context.c | 16 ++++++++-------- > drivers/gpu/drm/i915/i915_gem_render_state.c | 8 ++++++-- > 2 files changed, 14 insertions(+), 10 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i9= 15/i915_gem_context.c > index f220c94..6a2d847a 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -700,21 +700,21 @@ static int do_switch(struct intel_ring_buffer *ring, > /* obj is kept alive until the next request by its active ref */ > i915_gem_object_ggtt_unpin(from->obj); > i915_gem_context_unreference(from); > - } else { > - if (to->is_initialized =3D=3D false) { > - ret =3D i915_gem_render_state_init(ring); > - if (ret) > - DRM_ERROR("init render state: %d\n", ret); > - } > } > = > - to->is_initialized =3D true; > - > done: > i915_gem_context_reference(to); > ring->last_context =3D to; > to->last_ring =3D ring; > = > + if (ring->id =3D=3D RCS && !to->is_initialized && from =3D=3D NULL) { > + ret =3D i915_gem_render_state_init(ring); > + if (ret) > + DRM_ERROR("init render state: %d\n", ret); > + } > + > + to->is_initialized =3D true; > + > return 0; > = > unpin_out: > diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/d= rm/i915/i915_gem_render_state.c > index 392aa7b..cfbf6fc 100644 > --- a/drivers/gpu/drm/i915/i915_gem_render_state.c > +++ b/drivers/gpu/drm/i915/i915_gem_render_state.c > @@ -164,9 +164,11 @@ int i915_gem_render_state_init(struct intel_ring_buf= fer *ring) > const int gen =3D INTEL_INFO(ring->dev)->gen; > struct i915_render_state *so; > const struct intel_renderstate_rodata *rodata; > - u32 seqno; > int ret; > = > + if (WARN_ON(ring->id !=3D RCS)) > + return -ENOENT; > + > rodata =3D render_state_get_rodata(ring->dev, gen); > if (rodata =3D=3D NULL) > return 0; > @@ -186,8 +188,10 @@ int i915_gem_render_state_init(struct intel_ring_buf= fer *ring) > if (ret) > goto out; > = > - ret =3D i915_add_request(ring, &seqno); > + i915_vma_move_to_active(i915_gem_obj_to_ggtt(so->obj), ring); > = > + ret =3D __i915_add_request(ring, NULL, so->obj, NULL); > + /* __i915_add_request moves object to inactive if it fails */ > out: > render_state_free(so); > return ret; > -- = > 1.7.9.5 > = > _______________________________________________ > 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