Attachment 99361 Details for Bug 76619 – Ben's fix v4.

[patch] Ben's fix v4.

0001-drm-i915-bdw-Only-use-2g-GGTT-for-32b-platforms.patch (text/plain), 1.77 KB, created by Rodrigo Vivi on 2014-05-19 22:49:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rodrigo Vivi

Created: 2014-05-19 22:49:11 UTC

Size: 1.77 KB

patch

obsolete

>From 2815fadf2563d74676146d7fc5b3392dcf966fc4 Mon Sep 17 00:00:00 2001
>From: Ben Widawsky <benjamin.widawsky@intel.com>
>Date: Wed, 7 May 2014 19:17:59 -0700
>Subject: [PATCH] drm/i915/bdw: Only use 2g GGTT for 32b platforms
>
>Daniel requested in the bug that I use a 3GB fallback size. Since this
>is not in the spec as a valid size, I decided against it. We could
>potentially add a patch to bump it to 3GB on top of this one.
>
>This probably should be CC: stable - but I'll let the powers that be
>decide that one.
>
>Regression from a revert of the revert:
>commit 7907f45bf9f67a1c5e5d4ae05bab428d7c2f43b2
>Author: Ben Widawsky <benjamin.widawsky@intel.com>
>Date:   Wed Feb 19 22:05:46 2014 -0800
>
>    Revert "drm/i915/bdw: Limit GTT to 2GB"
>
>v2: Change ifdef to 32b, instead of ifndef
>update comment
>
>v3. Update comment to not wrap (Daniel).
>Update commit message
>
>v4: s/CONFIG_32/CONFIG_X86_32 (Jani).
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76619
>Cc: stable@vger.kernel.org
>Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
>---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
>index afd4eef..050e47e 100644
>--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
>+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
>@@ -1773,6 +1773,13 @@ 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;
>+
>+#ifdef CONFIG_X86_32BIT
>+	/* Limit 32B platforms to a 2GB GGTT: 4 << 20 / pte size * PAGE_SIZE */
>+	if (bdw_gmch_ctl > 4)
>+		bdw_gmch_ctl = 4;
>+#endif
>+
> 	return bdw_gmch_ctl << 20;
> }
> 
>-- 
>1.9.0
>

Actions: View | Splinter Review

Attachments on bug 76619: 96401 | 96403 | 96440 | 96472 | 96879 | 99051 | 99361 | 99366 | 99989 | 100018

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.