From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Volkin, Bradley D" Subject: Re: [PATCH 19/53] drm/i915: Extract pipe control fini & make init outside accesible Date: Wed, 18 Jun 2014 17:04:05 -0700 Message-ID: <20140619000405.GF5716@bdvolkin-ubuntu-desktop> References: <1402673891-14618-1-git-send-email-oscar.mateo@intel.com> <1402673891-14618-20-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 73C686E081 for ; Wed, 18 Jun 2014 17:03:22 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1402673891-14618-20-git-send-email-oscar.mateo@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: "oscar.mateo@intel.com" Cc: "intel-gfx@lists.freedesktop.org" List-Id: intel-gfx@lists.freedesktop.org On Fri, Jun 13, 2014 at 08:37:37AM -0700, oscar.mateo@intel.com wrote: > From: Oscar Mateo > > I plan to reuse these for the new logical ring path. > > No functional changes. > > Signed-off-by: Oscar Mateo > --- > 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. Brad > } > > static int gen6_signal(struct intel_engine_cs *signaller, > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h > index 599b4ed..42026a1 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.h > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h > @@ -221,6 +221,9 @@ struct intel_engine_cs { > > bool intel_ring_initialized(struct intel_engine_cs *ring); > > +void intel_fini_pipe_control(struct intel_engine_cs *ring); > +int intel_init_pipe_control(struct intel_engine_cs *ring); > + > static inline unsigned > intel_ring_flag(struct intel_engine_cs *ring) > { > -- > 1.9.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx