From patchwork Wed Oct 10 21:09:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1575801 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 9FCBF40135 for ; Wed, 10 Oct 2012 21:10:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 77A22A0AEC for ; Wed, 10 Oct 2012 14:10:44 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f49.google.com (mail-yh0-f49.google.com [209.85.213.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E7AF9E75E for ; Wed, 10 Oct 2012 14:10:19 -0700 (PDT) Received: by mail-yh0-f49.google.com with SMTP id j52so276509yhj.36 for ; Wed, 10 Oct 2012 14:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=3J7c6uoNyqwPphQImGhZ+eE+EdxBIdBjAiQT92dskDI=; b=yy3nNXQrQyewL+tWh3lFcGTphoxUDS5PrfPoTtIHUx1SlDc2FZRStI8d2BNgiSdGej KwwWZ9G8dZv8PjWLfDkH0/vNSpnUXJ+HwDgkk51YSkVCu6zs+osnE3MoEZuoUeY7+K8w Cz1VktBkgn7V9QQ830waU0/qWTAlj87BzO+rlyL6L/Xf+1akbCFlRlT2bwLXunhS5S0v 7pVb5XDNfA3FDgrvrfcI2WIMTT7of/iP4E1p7ivJ80GC+iFMexM7t1yAeufhFA43QsVE IsMZQxK47w0ujcv08xR0aA2qENEU932mb1CWb8yJseVsrKDVmN9sN/GJ4PleW9BTPAvy Wmow== Received: by 10.236.144.165 with SMTP id n25mr24608506yhj.61.1349903418911; Wed, 10 Oct 2012 14:10:18 -0700 (PDT) Received: from vicky.domain.invalid ([187.112.57.207]) by mx.google.com with ESMTPS id u13sm2134307anl.5.2012.10.10.14.10.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 14:10:18 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Wed, 10 Oct 2012 18:09:59 -0300 Message-Id: <1349903399-4417-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH] drm/i915: don't implement WaDisableEarlyCull for Haswell 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: , MIME-Version: 1.0 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: Paulo Zanoni Introduced in commit 87f8020ec9e3069597746040a4e8655189bc0c1a: drm/i915: implement WaDisableEarlyCull for VLV and IVB Notice that the original patch sent to the mailing list did not include the Haswell chunk, it was added later. The bit set by the commit does not exist on Haswell machines (at least that's what the documentation says). Also, the commit gives me a GPU hang every time we're loading the driver. So let's revert the Haswell chunk, making the patch do only what its title actually says. Signed-off-by: Paulo Zanoni Reviewed-by: Damien Lespiau --- drivers/gpu/drm/i915/intel_pm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index eb757e5..07da990 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3470,10 +3470,6 @@ static void haswell_init_clock_gating(struct drm_device *dev) */ I915_WRITE(GEN6_UCGCTL2, GEN6_RCZUNIT_CLOCK_GATE_DISABLE); - /* WaDisableEarlyCull */ - I915_WRITE(_3D_CHICKEN3, - _MASKED_BIT_ENABLE(_3D_CHICKEN_SF_DISABLE_OBJEND_CULL)); - /* Apply the WaDisableRHWOOptimizationForRenderHang workaround. */ I915_WRITE(GEN7_COMMON_SLICE_CHICKEN1, GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC);