From patchwork Fri Jan 15 12:24:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 73160 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0FCOmwQ003376 for ; Fri, 15 Jan 2010 12:24:48 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 105249F4C0; Fri, 15 Jan 2010 04:24:48 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.ffwll.ch (cable-static-49-187.intergga.ch [157.161.49.187]) by gabe.freedesktop.org (Postfix) with ESMTP id 58D379F4D6 for ; Fri, 15 Jan 2010 04:24:44 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id A272D20C244; Fri, 15 Jan 2010 13:24:43 +0100 (CET) X-Spam-ASN: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on orange.ffwll.ch X-Spam-Level: X-Spam-Hammy: 0.000-+--struct, 0.000-+--signedoffby, 0.000-+--signed-off-by X-Spam-Status: No, score=-1.2 required=6.0 tests=ALL_TRUSTED,BAYES_00, FH_DATE_PAST_20XX autolearn=no version=3.2.5 X-Spam-Spammy: 0.967-+--H*m:ffwll, 0.964-+--H*Ad:U*daniel.vetter, 0.953-+--H*r:mail.ffwll.ch Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id 803EF20C228; Fri, 15 Jan 2010 13:23:56 +0100 (CET) Received: from daniel by biene with local (Exim 4.71) (envelope-from ) id 1NVlE3-0003hb-M9; Fri, 15 Jan 2010 13:24:27 +0100 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Fri, 15 Jan 2010 13:24:18 +0100 Message-Id: X-Mailer: git-send-email 1.6.6 In-Reply-To: <13403acaf4bc67e4bd0dd317dbaef25ed7324050.1263558064.git.daniel.vetter@ffwll.ch> References: <74471ded981086a7e563554dd9d0ea490fb31a88.1263558064.git.daniel.vetter@ffwll.ch> <102f9fb63e13a34928c5fd4c1c42f2c578357d65.1263558064.git.daniel.vetter@ffwll.ch> <696000111f936935bff77e578594e1adbadd4811.1263558064.git.daniel.vetter@ffwll.ch> <4b6704aae352dc67313813a3aff309a51c84d8e8.1263558064.git.daniel.vetter@ffwll.ch> <218f84ba918f387762e080160db19fbf90b63462.1263558064.git.daniel.vetter@ffwll.ch> <929126816da9516827b8850d4c0c4dcd08cf3587.1263558064.git.daniel.vetter@ffwll.ch> <13403acaf4bc67e4bd0dd317dbaef25ed7324050.1263558064.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 11/11] drm/i915: order fence setup wrt subsequent wc cpu writes X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b11cd68..1b466d2 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2335,6 +2335,7 @@ static void i965_write_fence_reg(struct drm_i915_fence_reg *reg) val |= I965_FENCE_REG_VALID; I915_WRITE64(FENCE_REG_965_0 + (regnum * 8), val); + I915_READ64(FENCE_REG_965_0 + (regnum * 8)); } static void i915_write_fence_reg(struct drm_i915_fence_reg *reg) @@ -2377,6 +2378,7 @@ static void i915_write_fence_reg(struct drm_i915_fence_reg *reg) else fence_reg = FENCE_REG_945_8 + ((regnum - 8) * 4); I915_WRITE(fence_reg, val); + I915_READ(fence_reg); } static void i830_write_fence_reg(struct drm_i915_fence_reg *reg) @@ -2411,6 +2413,7 @@ static void i830_write_fence_reg(struct drm_i915_fence_reg *reg) val |= I830_FENCE_REG_VALID; I915_WRITE(FENCE_REG_830_0 + (regnum * 4), val); + I915_READ(FENCE_REG_830_0 + (regnum * 4)); } static int i915_find_fence_reg(struct drm_device *dev)