From patchwork Thu Nov 17 09:17:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9433661 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE60A60238 for ; Thu, 17 Nov 2016 09:17:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCEAA2938D for ; Thu, 17 Nov 2016 09:17:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF82629393; Thu, 17 Nov 2016 09:17:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 80BF52938D for ; Thu, 17 Nov 2016 09:17:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 196F26E276; Thu, 17 Nov 2016 09:17:46 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8DB0B6E276 for ; Thu, 17 Nov 2016 09:17:44 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id m203so19170045wma.3 for ; Thu, 17 Nov 2016 01:17:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=HaLWqBl2z5upJacMnWSfgHKiAJ/GCK81tC2uNlwszgU=; b=pWJ8Mjb28eiQ2gZfIb2rdgtvW3mJUhQdyGw9Js0tcpE+ev2SvAap58Qr9FV7nzHSzQ i1jngn1HTva+iDo3R7mwtU/5HrpaBkqAqWO+jW+uuKNAwFEhmZ3UgpOxuR6bUsz9eGlK yy64idjC/pc6E/yTyS90ftWH/WtqjuPAamP5BLDxIjoqb4J1qi7rCnYBPjXRHHHB43Li IiNh90J5uwWNO+2OU6X8nG25ofriIhxSoNajq0Ym0d8TdL0MaW9uVnwwJIydEyE2/P6C TRaqkrorgVTf1uiKUkY5Av/9ISwvj/qzYcFzXboZQkI5U5e8pg7r13670vhFfrHRc044 curQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=HaLWqBl2z5upJacMnWSfgHKiAJ/GCK81tC2uNlwszgU=; b=ApONycgTr6lvkOsDw1jcjVEFkuz/Ah/QKSaQzHMC4sPYa98X/VDyCLE3PMGVLT71jI DAh5vmq3G3u7lcpIfBrVnQlyvDiBSVnsnvPsPtu2SGuE6lLbJtFVH2kYKue2aPfyR3tf EBkX/RYJlb55NE79wFx9MbuYRvhMI/qJnrH2/Rgy5I/CHimDb3AQsUtlDxl1TddyDdLu hRC/BH5NFlmJGKsNOZRyDpu+y4sJyD4EifP9MPVZaOJf8lVOMRzGxywF0OX5Xm8MJI2u S8kDgObv9aoOp88Fd0+mMtHK5dMrLl0yluLSWZLYfqhLZPz6mSPp/T3B+DHB7EJsqQCV i2Jw== X-Gm-Message-State: AKaTC02+rrQArOfkTZrPGyivFwnSsYRvg2aM6ZdHLGTcnP7qjmZvrfRdIZlMPdNIF+CJbQ== X-Received: by 10.194.177.197 with SMTP id cs5mr1632673wjc.6.1479374263115; Thu, 17 Nov 2016 01:17:43 -0800 (PST) Received: from t460p.intel ([2a02:c7d:9bd6:b000:f37e:1e07:a7d8:46cd]) by smtp.gmail.com with ESMTPSA id d184sm2674474wmd.8.2016.11.17.01.17.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 01:17:42 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Thu, 17 Nov 2016 09:17:35 +0000 Message-Id: <1479374255-16870-1-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 Cc: Akash Goel Subject: [Intel-gfx] [PATCH] drm/i915/guc: Do not bypass forcewakes in i915_guc_submit X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 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-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Commit ed4596ea992d ("drm/i915/guc: WA to address the Ringbuffer coherency issue"), based on incorrect assumptions from a partialy broken commit 0dd356bb6ff5 ("drm/i915: Eliminate Gen9 special case") used POSTING_READ_FW instead of the POSTING_READ. With the latter buggy commit fixed this call site needs fixing as well. Signed-off-by: Tvrtko Ursulin Fixes: ed4596ea992d ("drm/i915/guc: WA to address the Ringbuffer coherency issue") Reported-by: Daniele Ceraolo Spurio Cc: Daniele Ceraolo Spurio Cc: Akash Goel Cc: Chris Wilson Cc: Sagar Arun Kamble --- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index 4462112725ef..c603837324a0 100644 --- a/drivers/gpu/drm/i915/i915_guc_submission.c +++ b/drivers/gpu/drm/i915/i915_guc_submission.c @@ -651,7 +651,7 @@ static void i915_guc_submit(struct drm_i915_gem_request *rq) /* WA to flush out the pending GMADR writes to ring buffer. */ if (i915_vma_is_map_and_fenceable(rq->ring->vma)) - POSTING_READ_FW(GUC_STATUS); + POSTING_READ(GUC_STATUS); b_ret = guc_ring_doorbell(client);