Attachment 142168 Details for Bug 108282 – 0001-ppgtt-i915-memory-address-masks.patch

[patch] 0001-ppgtt-i915-memory-address-masks.patch

0001-ppgtt-i915-memory-address-masks.patch (text/plain), 2.06 KB, created by Sergii Romantsov on 2018-10-24 10:29:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergii Romantsov

Created: 2018-10-24 10:29:44 UTC

Size: 2.06 KB

patch

obsolete

>From a5b93780c91cb75d067b5e3624f749fe072e6616 Mon Sep 17 00:00:00 2001
>From: Sergii Romantsov <sergii.romantsov@globallogic.com>
>Date: Wed, 24 Oct 2018 13:09:36 +0300
>Subject: [PATCH] ppgtt/i915: memory address masks
>
>Gen8+ ppgtt uses 48-bit addresses.
>Kernel driver uses masks to manipulate with addresses.
>Masks are UL-types. On 64-bit system UL is 64 bits,
>on 32-bit system - 32.
>So on 32-bit systems 48-bit adresses goes to be cut to 32 bits.
>
>CC: Kenneth Graunke <kenneth@whitecape.org>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108282
>Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
>Fixes: a363bb2cd0e2 (i965: Allocate VMA in userspace for full-PPGTT systems.)
>---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
> drivers/gpu/drm/i915/i915_gem_gtt.h | 7 ++++++-
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
>index 98d9a1e..7d25cb3 100644
>--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
>+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
>@@ -2273,7 +2273,7 @@ static void gen6_check_faults(struct drm_i915_private *dev_priv)
> 		fault = I915_READ(RING_FAULT_REG(engine));
> 		if (fault & RING_FAULT_VALID) {
> 			DRM_DEBUG_DRIVER("Unexpected fault\n"
>-					 "\tAddr: 0x%08lx\n"
>+					 "\tAddr: 0x%08llx\n"
> 					 "\tAddress space: %s\n"
> 					 "\tSource ID: %d\n"
> 					 "\tType: %d\n",
>diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
>index 7e2af5f..4d37400 100644
>--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
>+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
>@@ -673,6 +673,11 @@ int i915_gem_gtt_insert(struct i915_address_space *vm,
> #define PIN_HIGH		BIT(9)
> #define PIN_OFFSET_BIAS		BIT(10)
> #define PIN_OFFSET_FIXED	BIT(11)
>-#define PIN_OFFSET_MASK		(-I915_GTT_PAGE_SIZE)
>+#define PIN_OFFSET_MASK		(-(__u64)I915_GTT_PAGE_SIZE)
>+#undef PAGE_MASK		/* NOTE(sergii.romantsov): seems not the best
>+				 * idea, but original PAGE_MASK can\t be used
>+				 * for ppgtt at least with 32-bit kernel.
>+				 */
>+#define PAGE_MASK		(~((__u64)PAGE_SIZE-1))
> 
> #endif
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 108282: 141948 | 141972 | 142168 | 142299 | 142300

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.