From patchwork Fri May 9 12:08:40 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: 4142151 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C3F1ABFF02 for ; Fri, 9 May 2014 12:14:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 646CF202FE for ; Fri, 9 May 2014 12:14:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 36BD42028D for ; Fri, 9 May 2014 12:14:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DA08D4A059; Fri, 9 May 2014 05:14:35 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 631E56E516 for ; Fri, 9 May 2014 05:14:34 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 09 May 2014 05:14:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="4.97,1018,1389772800"; d="scan'208"; a="529106857" Received: from omateolo-linux2.iwi.intel.com ([172.28.253.145]) by fmsmga001.fm.intel.com with ESMTP; 09 May 2014 05:14:33 -0700 From: oscar.mateo@intel.com To: intel-gfx@lists.freedesktop.org Date: Fri, 9 May 2014 13:08:40 +0100 Message-Id: <1399637360-4277-11-git-send-email-oscar.mateo@intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1399637360-4277-1-git-send-email-oscar.mateo@intel.com> References: <1399637360-4277-1-git-send-email-oscar.mateo@intel.com> Subject: [Intel-gfx] [PATCH 10/50] 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.8 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 more new ringbuffer management functions. Signed-off-by: Oscar Mateo --- drivers/gpu/drm/i915/i915_dma.c | 3 ++- drivers/gpu/drm/i915/intel_display.c | 10 +++++----- drivers/gpu/drm/i915/intel_ringbuffer.c | 10 +++++----- drivers/gpu/drm/i915/intel_ringbuffer.h | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index a582a64..166fbdf 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -56,7 +56,8 @@ intel_ring_emit(LP_RING(dev_priv), x) #define ADVANCE_LP_RING() \ - __intel_ring_advance(LP_RING(dev_priv), LP_RING(dev_priv)->default_context) + intel_ringbuffer_advance_and_submit(LP_RING(dev_priv), \ + LP_RING(dev_priv)->default_context) /** * 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 d7c6ce5..e0550c6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8609,7 +8609,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: @@ -8651,7 +8651,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: @@ -8700,7 +8700,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: @@ -8745,7 +8745,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: @@ -8855,7 +8855,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 3b43070..0f4d3b6 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -56,7 +56,7 @@ static bool intel_ring_stopped(struct intel_engine *ring) return dev_priv->gpu_error.stop_rings & intel_ring_flag(ring); } -void __intel_ring_advance(struct intel_engine *ring, +void intel_ringbuffer_advance_and_submit(struct intel_engine *ring, struct i915_hw_context *ctx) { struct intel_ringbuffer *ringbuf = __get_ringbuf(ring); @@ -738,7 +738,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; } @@ -850,7 +850,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; } @@ -1092,7 +1092,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; } @@ -1577,7 +1577,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 4ed68b4..b2dcad4 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -313,8 +313,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);