public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Ben Widawsky <benjamin.widawsky@intel.com>
To: Intel GFX <intel-gfx@lists.freedesktop.org>
Cc: Ben Widawsky <ben@bwidawsk.net>,
	Ben Widawsky <benjamin.widawsky@intel.com>
Subject: [PATCH 6/7] Revert "drm/i915/bdw: Limit GTT to 2GB"
Date: Tue, 24 Dec 2013 13:42:36 -0800	[thread overview]
Message-ID: <1387921357-22942-7-git-send-email-benjamin.widawsky@intel.com> (raw)
In-Reply-To: <1387921357-22942-1-git-send-email-benjamin.widawsky@intel.com>

This reverts commit 3a2ffb65eec6dbda2fd8151894f51c18b42c8d41.

Now that the code is fixed to use smaller allocations, it should be safe
to let the full GGTT be used on DW.

The testcase for this is anything which uses more than half of the GTT,
thus eclipsing the old limit.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 8946b1c..37955db 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -1731,11 +1731,6 @@ static inline unsigned int gen8_get_total_gtt_size(u16 bdw_gmch_ctl)
 	bdw_gmch_ctl &= BDW_GMCH_GGMS_MASK;
 	if (bdw_gmch_ctl)
 		bdw_gmch_ctl = 1 << bdw_gmch_ctl;
-	if (bdw_gmch_ctl > 4) {
-		WARN_ON(!i915_preliminary_hw_support);
-		return 4<<20;
-	}
-
 	return bdw_gmch_ctl << 20;
 }
 
-- 
1.8.5.2

  parent reply	other threads:[~2013-12-24 21:42 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-24 21:42 [PATCH 0/7] GEN8 PPGTT cleanups + 4GB support Ben Widawsky
2013-12-24 21:42 ` [PATCH 1/7] drm/i915/bdw: Split up PPGTT cleanup Ben Widawsky
2013-12-24 21:42 ` [PATCH 2/7] drm/i915/bdw: Reorganize PPGTT init Ben Widawsky
2013-12-25  6:58   ` [PATCH 2/7] [v2] " Ben Widawsky
2013-12-24 21:42 ` [PATCH 3/7] drm/i915/bdw: Split ppgtt initialization up Ben Widawsky
2013-12-25  7:04   ` [PATCH 3/7] [v2] " Ben Widawsky
2013-12-24 21:42 ` [PATCH 4/7] drm/i915: Make clear/insert vfuncs args absolute Ben Widawsky
2013-12-24 21:42 ` [PATCH 5/7] drm/i915/bdw: Reorganize PT allocations Ben Widawsky
2013-12-24 21:42 ` Ben Widawsky [this message]
2013-12-24 21:42 ` [PATCH 7/7] drm/i915: Update i915_gem_gtt.c copyright Ben Widawsky
2013-12-26  2:17 ` [PATCH 8/9] drm/i915: Split GEN6 PPGTT cleanup Ben Widawsky
2013-12-26  2:17   ` [PATCH 9/9] drm/i915: Split GEN6 PPGTT initialization up Ben Widawsky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1387921357-22942-7-git-send-email-benjamin.widawsky@intel.com \
    --to=benjamin.widawsky@intel.com \
    --cc=ben@bwidawsk.net \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox