From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@intel.com>
Subject: Re: [PATCH v2 for -fixes] drm/i915: Disable stolen
	memory when DMAR is active
Date: Wed, 19 Mar 2014 11:07:20 +0200
Message-ID: <87txauy2t3.fsf@intel.com>
References: <1393589642-9992-1-git-send-email-chris@chris-wilson.co.uk>
 <1395147544-16984-1-git-send-email-jani.nikula@intel.com>
 <20140318164828.GE30571@phenom.ffwll.local>
 <20140318165044.GF30571@phenom.ffwll.local>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 0E80F4A85C
 for <intel-gfx@lists.freedesktop.org>; Wed, 19 Mar 2014 02:07:05 -0700 (PDT)
In-Reply-To: <20140318165044.GF30571@phenom.ffwll.local>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Tue, 18 Mar 2014, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Tue, Mar 18, 2014 at 05:48:28PM +0100, Daniel Vetter wrote:
>> On Tue, Mar 18, 2014 at 02:59:04PM +0200, Jani Nikula wrote:
>> > From: Chris Wilson <chris@chris-wilson.co.uk>
>> > 
>> > We have reports of heavy screen corruption if we try to use the stolen
>> > memory reserved by the BIOS whilst the DMA-Remapper is active. This
>> > quirk may be only specific to a few machines or BIOSes, but first lets
>> > apply the big hammer and always disable use of stolen memory when DMAR
>> > is active.
>> > 
>> > v2 by Jani: Rebase on -fixes, only look at intel_iommu_gfx_mapped.
>> > 
>> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68535
>> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> > 
>> > ---
>> > 
>> > Daniel, is this the color you want?
>> 
>> Yeah, colour looks shiny ;-) Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Correction, cc: stable is missing.

Pushed to -fixes, thanks for the patch (original by Chris) and review.

Jani.


> -Daniel
>
>> > 
>> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> > ---
>> >  drivers/gpu/drm/i915/i915_gem_stolen.c |    7 +++++++
>> >  1 file changed, 7 insertions(+)
>> > 
>> > diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
>> > index d58b4e287e32..28d24caa49f3 100644
>> > --- a/drivers/gpu/drm/i915/i915_gem_stolen.c
>> > +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
>> > @@ -214,6 +214,13 @@ int i915_gem_init_stolen(struct drm_device *dev)
>> >  	struct drm_i915_private *dev_priv = dev->dev_private;
>> >  	int bios_reserved = 0;
>> >  
>> > +#ifdef CONFIG_INTEL_IOMMU
>> > +	if (intel_iommu_gfx_mapped) {
>> > +		DRM_INFO("DMAR active, disabling use of stolen memory\n");
>> > +		return 0;
>> > +	}
>> > +#endif
>> > +
>> >  	if (dev_priv->gtt.stolen_size == 0)
>> >  		return 0;
>> >  
>> > -- 
>> > 1.7.9.5
>> > 
>> 
>> -- 
>> Daniel Vetter
>> Software Engineer, Intel Corporation
>> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
>
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center