[Intel-gfx] [PATCH] drm/i915: Sanitize the enable_ppgtt module option once

[Daniel Vetter]

On Tue, Apr 29, 2014 at 02:23:56PM +0200, Alessandro Suardi wrote:
> On Tue, Apr 29, 2014 at 12:44 PM, Chris Wilson <chris at chris-wilson.co.uk> wrote:
> > On Tue, Apr 29, 2014 at 11:53:58AM +0200, Daniel Vetter wrote:
> >> Otherwise we'll end up spamming dmesg on every context creation on snb
> >> with vt-d enabled. This regression was introduced in
> >>
> >> commit 246cbfb5fb9a1ca0997fbb135464c1ff5bb9c549
> >> Author: Ben Widawsky <benjamin.widawsky at intel.com>
> >> Date:   Fri Dec 6 14:11:14 2013 -0800
> >>
> >>     drm/i915: Reorganize intel_enable_ppgtt
> >>
> >> As the i915.enable_ppgtt is read-only it cannot be changed after the
> >> module is loaded and so we can perform an early sanitization of the
> >> values.
> >>
> >> v2:
> >> - Add comment and pimp commit message (Chris)
> >> - Use the param consistently (Jani)
> >>
> >> v3:
> >> - Fix init sequence on pre-gen6 by moving the sanitize_ppgtt call to
> >>   gtt_init. Fixes boot hangs on pre-gen6.
> >> - Add a debug output for the sanitize ppgtt mode.
> >>
> >> References: https://lkml.org/lkml/2014/4/17/599
> >> Rererences: https://bugs.freedesktop.org/show_bug.cgi?id=77916
> >> Cc: Alessandro Suardi <alessandro.suardi at gmail.com>
> >> Cc: Ben Widawsky <ben at bwidawsk.net>
> >> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> >> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> >
> > I am pretty sure we only call i915_gem_gtt_init() once during driver
> > load... So let's try that r-b again.
> > Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
> > -Chris
> 
> I'd like to add my Tested-By, but this patch doesn't apply cleanly to
>  3.15-rc3 - is there any prerequisite patch on top of -rc3 or should I
>  use a git tree to test this fix ?

It needs one patch from drm-intel-fixes, probably easiest if you just grab
that git tree. Or grab the relevant patch

http://cgit.freedesktop.org/drm-intel/commit/?id=0f9dc59db6abc475dc23afc077fabbc606b8830f

> Offtopic, this email has a tiny typo (Rererences in the freedesktop
>  bug ID line), just in case git actually stores that kind of metadata :)

Jani, can you please rectify this?

Thanks, Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch