From patchwork Wed Oct 22 09:23:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 5130701 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D3BF4C11AC for ; Wed, 22 Oct 2014 09:23:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9920201D3 for ; Wed, 22 Oct 2014 09:23:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 091D3201EF for ; Wed, 22 Oct 2014 09:23:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CFD846E189; Wed, 22 Oct 2014 02:23:01 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A5096E189 for ; Wed, 22 Oct 2014 02:23:00 -0700 (PDT) Received: by mail-wg0-f42.google.com with SMTP id z12so3255073wgg.13 for ; Wed, 22 Oct 2014 02:22:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=jhqH3BxoKmfd45HIQe/WE6HhKcj8KAjaRev3cRk9oBM=; b=HhZznCBhYfuEth8Ie3vDpiF3SN1gPIzveDrXD20ypqWfds4jFyP5qFdFeqMKiQ7vPM 3vkVHe/YUXxfSJpxtu+Z1B2WiT1BCgkW3Vk2bLwOOp8Qk3TU3tq3m3j6gUjuwSVOLl3h cgfPNZ2uvBEb5aR2099SuAxgKwdP/s5GOh5Ko= 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=jhqH3BxoKmfd45HIQe/WE6HhKcj8KAjaRev3cRk9oBM=; b=ScEEI6K2r5DS0w/ztRZc4uTbeiUivy8/iZAJUkiGEosUVn0C475LpiCDxwrA+tX2ZS rKpWx5IoYCShWuvHtSz7bGyhgwW7F30kZjOFnlZlxRV569dJnJNKC3KhqhqmN2IBCUoY TlaUU07acS6SdG97NHZQZgg7Rkfanr+Tk0ELuBJLH7gm7xRURGnaQX7B59zqIkkKAf/i PegxWCweH/zqqI4jwpjKTMbOvl5jc7fS2+/Me+3cIPNhUV8drG0/agBTo++/SVeZzx2l q9S6tXDqgvc6vJ97+eme4Ch6pE20pX0/jPFNptHya4PUtXq8YolqOrZSVcihw7UJloC9 o/Lg== X-Gm-Message-State: ALoCoQnLYBcC9+3mVuSNv1BQf9pRQOxtDhpb/z6ymzpW4RfsKfTGIFEiBduKsizSl6BNl2jbHlox X-Received: by 10.180.207.77 with SMTP id lu13mr4413070wic.12.1413969778949; Wed, 22 Oct 2014 02:22:58 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id u5sm1233697wiz.9.2014.10.22.02.22.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Oct 2014 02:22:57 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Subject: [PATCH] Revert "drm/i915: Enable full PPGTT on gen7" Date: Wed, 22 Oct 2014 11:23:03 +0200 Message-Id: <1413969784-22490-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.1 Cc: Michel Thierry , Daniel Vetter , DRI Development , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 8c50f10d73b50139dcfe48bc22f2c8c7822c1983. It's not yet solid and Dave objected to pulling the tree in its current state. Cc: Michel Thierry Cc: Dave Airlie Cc: Chris Wilson References: http://mid.mail-archive.com/CAPM=9ty2r1MLE=wzC-_vNSUzXVqAyXiGgocpSV9qOp0gzpK3xA@mail.gmail.com References: http://lists.freedesktop.org/archives/intel-gfx/2014-October/053926.html Signed-off-by: Daniel Vetter Acked-by: Chris Wilson --- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 273dad964e1b..8ddc834f722f 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -67,7 +67,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt) return 0; } - return has_full_ppgtt ? 2 : has_aliasing_ppgtt ? 1 : 0; + return has_aliasing_ppgtt ? 1 : 0; }