From patchwork Sat Feb 2 12:56:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 2083931 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 D59AC3FD2B for ; Sat, 2 Feb 2013 13:31:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD07FE5F79 for ; Sat, 2 Feb 2013 05:31:18 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy7-pub.bluehost.com (oproxy7-pub.bluehost.com [67.222.55.9]) by gabe.freedesktop.org (Postfix) with SMTP id EA4F2E5F79 for ; Sat, 2 Feb 2013 05:26:22 -0800 (PST) Received: (qmail 28028 invoked by uid 0); 2 Feb 2013 13:26:17 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy7.bluehost.com with SMTP; 2 Feb 2013 13:26:17 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:To:From; bh=7yoWXa66TtmSvhSzabsLJDKk3Pm/JwRHC80aPVF7Dc4=; b=q3gjZCJ4INrel0U0k3SnepV49FcYlPdZUhIkFDtxPqg02teIsPCgPfhE0NQeuwxbC7dHYi+63oi+BgPjEI61k2aYaY8pupkAGPZs+IzXZ1ha2SaC9JjOqLhCrSztx0FS; Received: from [151.216.70.136] (port=59537 helo=jbarnes-t420.intel.com) by box514.bluehost.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1U1ceN-0006Th-T7 for intel-gfx@lists.freedesktop.org; Sat, 02 Feb 2013 05:56:56 -0700 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Sat, 2 Feb 2013 13:56:23 +0100 Message-Id: <1359809786-26434-20-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359809786-26434-1-git-send-email-jbarnes@virtuousgeek.org> References: <1359809786-26434-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 151.216.70.136 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 19/22] drm/i915: use gen6 stolen check on VLV 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 It uses the same bit definitions. Signed-off-by: Jesse Barnes --- 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 eac2cec..3900b98 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -725,7 +725,7 @@ int i915_gem_gtt_init(struct drm_device *dev) pci_read_config_word(dev->pdev, SNB_GMCH_CTRL, &snb_gmch_ctl); dev_priv->mm.gtt->gtt_total_entries = gen6_get_total_gtt_size(snb_gmch_ctl) / sizeof(gtt_pte_t); - if (INTEL_INFO(dev)->gen < 7) + if (INTEL_INFO(dev)->gen < 7 || IS_VALLEYVIEW(dev)) dev_priv->mm.gtt->stolen_size = gen6_get_stolen_size(snb_gmch_ctl); else dev_priv->mm.gtt->stolen_size = gen7_get_stolen_size(snb_gmch_ctl);