From patchwork Mon Nov 26 12:48:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 1802771 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 1A37540AF9 for ; Mon, 26 Nov 2012 15:52:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D1DE5E5CB5 for ; Mon, 26 Nov 2012 07:52:27 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D61AE5C37 for ; Mon, 26 Nov 2012 04:48:31 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 26 Nov 2012 04:48:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.83,320,1352102400"; d="scan'208";a="254285144" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.168]) by fmsmga002.fm.intel.com with SMTP; 26 Nov 2012 04:48:29 -0800 Received: by stinkbox (sSMTP sendmail emulation); Mon, 26 Nov 2012 14:48:28 +0200 From: ville.syrjala@linux.intel.com To: intel-gfx@lists.freedesktop.org Date: Mon, 26 Nov 2012 14:48:19 +0200 Message-Id: <1353934099-18685-3-git-send-email-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1353934099-18685-1-git-send-email-ville.syrjala@linux.intel.com> References: <1353934099-18685-1-git-send-email-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Warn if ring tail is not qword aligned X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org From: Ville Syrjälä Ringbuffer tail pointer must be qword aligned. Warn if someone makes a mistake and forgets to pad the ring when the commands inserted into the ring don't align to qword naturally. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 70a184e..79c8b13 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1275,6 +1275,8 @@ void intel_ring_advance(struct intel_ring_buffer *ring) ring->tail &= ring->size - 1; if (dev_priv->stop_rings & intel_ring_flag(ring)) return; + /* tail must be qword aligned */ + WARN_ON(ring->tail & 7); ring->write_tail(ring, ring->tail); }