From patchwork Tue Apr 23 14:56:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Conklin X-Patchwork-Id: 238936 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 2A46C2C0100 for ; Wed, 24 Apr 2013 00:57:52 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UUef6-0004dI-IV; Tue, 23 Apr 2013 14:57:40 +0000 Received: from mail-ia0-f181.google.com ([209.85.210.181]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UUef4-0004dD-Tg for kernel-team@lists.ubuntu.com; Tue, 23 Apr 2013 14:57:39 +0000 Received: by mail-ia0-f181.google.com with SMTP id k38so629640iah.26 for ; Tue, 23 Apr 2013 07:57:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer; bh=lSNbdPOBdj1TZ4mgH/rvhJrcueLtdjFzzlvSuOZQeiU=; b=mcHjZ736xY+3CsBB/pMnfxyan98Qnf+a+2nu88UofqsDVb7/Z6CghO3NqhBs6ejOA3 KZ8wGxoQJQZckUO3LUPPVrxuFa9MJ2Up6QfV3FgE2VHmOHnLaedyVIv007feCDbjzm5A IzS+qoqNuxU5a0hr59vXPBhsDp3jyPhtIrXkrY2anPFJyluKEz9fo0bYi+DZdjigkRll zT6gR6vY6bhJzub1Kz3KFoJe9TI1fP40b+5isyDvf6eXMHvEMT2iTWC1JzUuGgfG2ALT Zpf/eUJfTTu/ps7r8lnNpTijgHmV7wjYeq4Rm6iCKyRBoyfUv/bJyfpWBjen7QNM/gmn tg1A== X-Received: by 10.50.131.225 with SMTP id op1mr9239322igb.112.1366729058251; Tue, 23 Apr 2013 07:57:38 -0700 (PDT) Received: from localhost.localdomain ([24.96.64.103]) by mx.google.com with ESMTPS id wx2sm22914415igb.4.2013.04.23.07.57.37 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Apr 2013 07:57:37 -0700 (PDT) From: Steve Conklin To: kernel-team@lists.ubuntu.com Subject: [PATCH] [QUANTAL] Revert "drm/i915: GFX_MODE Flush TLB Invalidate Mode must be '1' for scanline waits" Date: Tue, 23 Apr 2013 09:56:31 -0500 Message-Id: <1366728991-12089-1-git-send-email-sconklin@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This reverts commit 4c443ec9afe7f6fab41106c617136aca44d69a7b. This commit has been shown to cause GPU hangs on Sandy Bridge GPUs --- drivers/gpu/drm/i915/intel_ringbuffer.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 83eaa1d..102b6a7 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -435,11 +435,6 @@ static int init_render_ring(struct intel_ring_buffer *ring) if (INTEL_INFO(dev)->gen >= 6) I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(ASYNC_FLIP_PERF_DISABLE)); - /* Required for the hardware to program scanline values for waiting */ - if (INTEL_INFO(dev)->gen == 6) - I915_WRITE(GFX_MODE, - _MASKED_BIT_ENABLE(GFX_TLB_INVALIDATE_ALWAYS)); - if (IS_GEN7(dev)) I915_WRITE(GFX_MODE_GEN7, _MASKED_BIT_DISABLE(GFX_TLB_INVALIDATE_ALWAYS) |