From mboxrd@z Thu Jan 1 00:00:00 1970 From: oscar.mateo@intel.com Subject: [PATCH 05/50] drm/i915: Extract ringbuffer destroy, make destroy & alloc outside accesible Date: Fri, 9 May 2014 13:08:35 +0100 Message-ID: <1399637360-4277-6-git-send-email-oscar.mateo@intel.com> References: <1399637360-4277-1-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 9B2116E4FB for ; Fri, 9 May 2014 05:14:28 -0700 (PDT) In-Reply-To: <1399637360-4277-1-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org From: Oscar Mateo No functional changes. Signed-off-by: Oscar Mateo --- drivers/gpu/drm/i915/intel_ringbuffer.c | 21 ++++++++++++++------- drivers/gpu/drm/i915/intel_ringbuffer.h | 3 +++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index fc737c8..5d61923 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1368,7 +1368,18 @@ static int init_phys_status_page(struct intel_ring_buffer *ring) return 0; } -static int allocate_ring_buffer(struct intel_ring_buffer *ring) +void intel_destroy_ring_buffer(struct intel_ring_buffer *ring) +{ + if (!ring->obj) + return; + + iounmap(ring->virtual_start); + i915_gem_object_ggtt_unpin(ring->obj); + drm_gem_object_unreference(&ring->obj->base); + ring->obj = NULL; +} + +int intel_allocate_ring_buffer(struct intel_ring_buffer *ring) { struct drm_device *dev = ring->dev; struct drm_i915_private *dev_priv = to_i915(dev); @@ -1435,7 +1446,7 @@ static int intel_init_ring_buffer(struct drm_device *dev, return ret; } - ret = allocate_ring_buffer(ring); + ret = intel_allocate_ring_buffer(ring); if (ret) { DRM_ERROR("Failed to allocate ringbuffer %s: %d\n", ring->name, ret); return ret; @@ -1464,11 +1475,7 @@ void intel_cleanup_ring_buffer(struct intel_ring_buffer *ring) intel_stop_ring_buffer(ring); WARN_ON((I915_READ_MODE(ring) & MODE_IDLE) == 0); - iounmap(ring->virtual_start); - - i915_gem_object_ggtt_unpin(ring->obj); - drm_gem_object_unreference(&ring->obj->base); - ring->obj = NULL; + intel_destroy_ring_buffer(ring); ring->preallocated_lazy_request = NULL; ring->outstanding_lazy_seqno = 0; diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index b1bf767..680e451 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -307,6 +307,9 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev); u64 intel_ring_get_active_head(struct intel_ring_buffer *ring); void intel_ring_setup_status_page(struct intel_ring_buffer *ring); +void intel_destroy_ring_buffer(struct intel_ring_buffer *ring); +int intel_allocate_ring_buffer(struct intel_ring_buffer *ring); + static inline u32 intel_ring_get_tail(struct intel_ring_buffer *ring) { return ring->tail; -- 1.9.0