From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH 05/66] drm/i915: Don't clear gtt with 0 entries Date: Thu, 27 Jun 2013 16:30:06 -0700 Message-ID: <1372375867-1003-6-git-send-email-ben@bwidawsk.net> References: <1372375867-1003-1-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from shiva.localdomain (unknown [209.20.75.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 83C21E5F39 for ; Thu, 27 Jun 2013 16:28:15 -0700 (PDT) In-Reply-To: <1372375867-1003-1-git-send-email-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Intel GFX Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org This will help keep the next patch cleaner which will conditionally clear the guard page, and use 0 num_entries when not actually clear space for guard page. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 216e7a1..0fce8d0 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -516,6 +516,9 @@ static void gen6_ggtt_clear_range(struct drm_device *dev, const int max_entries = gtt_total_entries(dev_priv->gtt) - first_entry; int i; + if (num_entries == 0) + return; + if (WARN(num_entries > max_entries, "First entry = %d; Num entries = %d (max=%d)\n", first_entry, num_entries, max_entries)) @@ -546,6 +549,9 @@ static void i915_ggtt_clear_range(struct drm_device *dev, unsigned int first_entry, unsigned int num_entries) { + if (num_entries == 0) + return; + intel_gtt_clear_range(first_entry, num_entries); } -- 1.8.3.1