Attachment 96943 Details for Bug 71031 – New patch to test

[patch] New patch to test

0001-drm-i915-Don-t-complain-about-stolen-conflicts-on-ge.patch (text/plain), 1.30 KB, created by Daniel Vetter on 2014-04-05 10:49:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2014-04-05 10:49:57 UTC

Size: 1.30 KB

patch

obsolete

>From 5d1d884239018f975460e073d8cdfb4b836a082b Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Sat, 5 Apr 2014 12:47:52 +0200
>Subject: [PATCH] drm/i915: Don't complain about stolen conflicts on gen3
>
>Apparently stuff works that way on those machines.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76983
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71031
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/i915_gem_stolen.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
>index 62ef55ba061c..99d147af173a 100644
>--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
>+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
>@@ -93,7 +93,11 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
> 		r = devm_request_mem_region(dev->dev, base + 1,
> 					    dev_priv->gtt.stolen_size - 1,
> 					    "Graphics Stolen Memory");
>-		if (r == NULL) {
>+		/*
>+		 * GEN3 firmware likes to smash pci bridges into the stolen
>+		 * range. Apparently this works.
>+		 */
>+		if (r == NULL && !IS_GEN3(dev)) {
> 			DRM_ERROR("conflict detected with stolen region: [0x%08x - 0x%08x]\n",
> 				  base, base + (uint32_t)dev_priv->gtt.stolen_size);
> 			base = 0;
>-- 
>1.8.5.2
>

Actions: View | Splinter Review

Attachments on bug 71031: 88339 | 88340 | 88398 | 88399 | 92036 | 92114 | 92706 | 92793 | 95162 | 95571 | 96494 | 96507 | 96508 | 96515 | 96635 | 96943

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.