From patchwork Thu Mar 27 17:59:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: oscar.mateo@intel.com X-Patchwork-Id: 3898631 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C72D29F334 for ; Thu, 27 Mar 2014 17:09:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2FFD2024D for ; Thu, 27 Mar 2014 17:09:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E5B5A20237 for ; Thu, 27 Mar 2014 17:09:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C7856E9ED; Thu, 27 Mar 2014 10:09:37 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id C9C016E9ED for ; Thu, 27 Mar 2014 10:09:36 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 27 Mar 2014 10:03:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,743,1389772800"; d="scan'208";a="501086676" Received: from omateolo-linux2.iwi.intel.com ([172.28.253.148]) by fmsmga001.fm.intel.com with ESMTP; 27 Mar 2014 10:06:09 -0700 From: oscar.mateo@intel.com To: intel-gfx@lists.freedesktop.org Date: Thu, 27 Mar 2014 17:59:52 +0000 Message-Id: <1395943218-7708-24-git-send-email-oscar.mateo@intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1395943218-7708-1-git-send-email-oscar.mateo@intel.com> References: <1395943218-7708-1-git-send-email-oscar.mateo@intel.com> Subject: [Intel-gfx] [PATCH 23/49] drm/i915: s/__intel_ring_advance/intel_ringbuffer_advance_and_submit X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Oscar Mateo The "__" name is too confusing, specially given the refactoring patch that comes soon with new ringbuffer management functions. Signed-off-by: Oscar Mateo --- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 10 +++++----- drivers/gpu/drm/i915/intel_ringbuffer.c | 14 +++++++------- drivers/gpu/drm/i915/intel_ringbuffer.h | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 76b47a6..29583da 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -56,7 +56,7 @@ intel_ring_emit(LP_RING(dev_priv), x) #define ADVANCE_LP_RING() \ - __intel_ring_advance(LP_RING(dev_priv), NULL) + intel_ringbuffer_advance_and_submit(LP_RING(dev_priv), NULL) /** * Lock test for when it's just for synchronization of ring access. diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 462c7ae..22be556 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8637,7 +8637,7 @@ static int intel_gen2_queue_flip(struct drm_device *dev, intel_ring_emit(ring, 0); /* aux display base address, unused */ intel_mark_page_flip_active(intel_crtc); - __intel_ring_advance(ring, ring->default_context); + intel_ringbuffer_advance_and_submit(ring, ring->default_context); return 0; err_unpin: @@ -8679,7 +8679,7 @@ static int intel_gen3_queue_flip(struct drm_device *dev, intel_ring_emit(ring, MI_NOOP); intel_mark_page_flip_active(intel_crtc); - __intel_ring_advance(ring, ring->default_context); + intel_ringbuffer_advance_and_submit(ring, ring->default_context); return 0; err_unpin: @@ -8728,7 +8728,7 @@ static int intel_gen4_queue_flip(struct drm_device *dev, intel_ring_emit(ring, pf | pipesrc); intel_mark_page_flip_active(intel_crtc); - __intel_ring_advance(ring, ring->default_context); + intel_ringbuffer_advance_and_submit(ring, ring->default_context); return 0; err_unpin: @@ -8773,7 +8773,7 @@ static int intel_gen6_queue_flip(struct drm_device *dev, intel_ring_emit(ring, pf | pipesrc); intel_mark_page_flip_active(intel_crtc); - __intel_ring_advance(ring, ring->default_context); + intel_ringbuffer_advance_and_submit(ring, ring->default_context); return 0; err_unpin: @@ -8867,7 +8867,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev, intel_ring_emit(ring, (MI_NOOP)); intel_mark_page_flip_active(intel_crtc); - __intel_ring_advance(ring, ring->default_context); + intel_ringbuffer_advance_and_submit(ring, ring->default_context); return 0; err_unpin: diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 4fbea79..ac4e618 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -43,8 +43,8 @@ static inline int ring_space(struct intel_engine *ring) return space; } -void __intel_ring_advance(struct intel_engine *ring, - struct i915_hw_context *ctx) +void intel_ringbuffer_advance_and_submit(struct intel_engine *ring, + struct i915_hw_context *ctx) { struct drm_i915_private *dev_priv = ring->dev->dev_private; struct intel_ringbuffer *ringbuf = __get_ringbuf(ring); @@ -726,7 +726,7 @@ gen6_add_request(struct intel_engine *ring, intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT); intel_ring_emit(ring, ring->outstanding_lazy_seqno); intel_ring_emit(ring, MI_USER_INTERRUPT); - __intel_ring_advance(ring, ctx); + intel_ringbuffer_advance_and_submit(ring, ctx); return 0; } @@ -745,7 +745,7 @@ gen8_add_request(struct intel_engine *ring, intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT); intel_ring_emit(ring, ring->outstanding_lazy_seqno); intel_ring_emit(ring, MI_USER_INTERRUPT); - __intel_ring_advance(ring, ctx); + intel_ringbuffer_advance_and_submit(ring, ctx); return 0; } @@ -859,7 +859,7 @@ pc_render_add_request(struct intel_engine *ring, intel_ring_emit(ring, ring->scratch.gtt_offset | PIPE_CONTROL_GLOBAL_GTT); intel_ring_emit(ring, ring->outstanding_lazy_seqno); intel_ring_emit(ring, 0); - __intel_ring_advance(ring, ctx); + intel_ringbuffer_advance_and_submit(ring, ctx); return 0; } @@ -1093,7 +1093,7 @@ i9xx_add_request(struct intel_engine *ring, intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT); intel_ring_emit(ring, ring->outstanding_lazy_seqno); intel_ring_emit(ring, MI_USER_INTERRUPT); - __intel_ring_advance(ring, ctx); + intel_ringbuffer_advance_and_submit(ring, ctx); return 0; } @@ -1621,7 +1621,7 @@ static int ring_wait_for_space(struct intel_engine *ring, return ret; /* force the tail write in case we have been skipping them */ - __intel_ring_advance(ring, ctx); + intel_ringbuffer_advance_and_submit(ring, ctx); trace_i915_ring_wait_begin(ring); /* With GEM the hangcheck timer should kick us out of the loop, diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 95e29e0..cd6c52a 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -302,8 +302,8 @@ static inline void intel_ring_advance(struct intel_engine *ring) ringbuf->tail &= ringbuf->size - 1; } -void __intel_ring_advance(struct intel_engine *ring, - struct i915_hw_context *ctx); +void intel_ringbuffer_advance_and_submit(struct intel_engine *ring, + struct i915_hw_context *ctx); int __must_check intel_ring_idle(struct intel_engine *ring); void intel_ring_init_seqno(struct intel_engine *ring, u32 seqno);