> -----Original Message----- > From: Volkin, Bradley D > Sent: Thursday, June 19, 2014 1:04 AM > To: Mateo Lozano, Oscar > Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Subject: Re: [PATCH 19/53] drm/i915: Extract pipe control fini & > make init outside accesible > > On Fri, Jun 13, 2014 at 08:37:37AM -0700, oscar.mateo@xxxxxxxxx wrote: > > From: Oscar Mateo <oscar.mateo@xxxxxxxxx> > > > > I plan to reuse these for the new logical ring path. > > > > No functional changes. > > > > Signed-off-by: Oscar Mateo <oscar.mateo@xxxxxxxxx> > > --- > > drivers/gpu/drm/i915/intel_ringbuffer.c | 31 > > ++++++++++++++++++------------- > > drivers/gpu/drm/i915/intel_ringbuffer.h | 3 +++ > > 2 files changed, 21 insertions(+), 13 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c > > b/drivers/gpu/drm/i915/intel_ringbuffer.c > > index 4a71dd4..254e4c5 100644 > > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > > @@ -574,8 +574,21 @@ out: > > return ret; > > } > > > > -static int > > -init_pipe_control(struct intel_engine_cs *ring) > > +void > > +intel_fini_pipe_control(struct intel_engine_cs *ring) { > > + if (ring->scratch.obj == NULL) > > + return; > > + > > + kunmap(sg_page(ring->scratch.obj->pages->sgl)); > > + i915_gem_object_ggtt_unpin(ring->scratch.obj); > > + > > + drm_gem_object_unreference(&ring->scratch.obj->base); > > + ring->scratch.obj = NULL; > > +} > > + > > +int > > +intel_init_pipe_control(struct intel_engine_cs *ring) > > { > > int ret; > > > > @@ -648,7 +661,7 @@ static int init_render_ring(struct intel_engine_cs > *ring) > > _MASKED_BIT_ENABLE(GFX_REPLAY_MODE)); > > > > if (INTEL_INFO(dev)->gen >= 5) { > > - ret = init_pipe_control(ring); > > + ret = intel_init_pipe_control(ring); > > if (ret) > > return ret; > > } > > @@ -676,16 +689,8 @@ static void render_ring_cleanup(struct > > intel_engine_cs *ring) { > > struct drm_device *dev = ring->dev; > > > > - if (ring->scratch.obj == NULL) > > - return; > > - > > - if (INTEL_INFO(dev)->gen >= 5) { > > - kunmap(sg_page(ring->scratch.obj->pages->sgl)); > > - i915_gem_object_ggtt_unpin(ring->scratch.obj); > > - } > > - > > - drm_gem_object_unreference(&ring->scratch.obj->base); > > - ring->scratch.obj = NULL; > > + if (INTEL_INFO(dev)->gen >= 5) > > + intel_fini_pipe_control(ring); > > It looks like we've changed the behavior such that for the case of scratch.obj > != NULL && gen < 5, we don't unreference scratch.obj. > I don't know if we can ever hit that case though. I think you´re right, what was I thinking? :( Thanks for the heads up! _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx