[Intel-gfx] [PULL] drm-intel-next-queued

[Daniel Vetter]

On Sat, Aug 3, 2013 at 5:47 AM, Ben Widawsky <ben at bwidawsk.net> wrote:
> Hi Daniel.
>
> Jesse and Chris get egging me on to merge some patches. Dave has already
> merged the one patch for -fixes, so I have nothing but patches for
> -next-queued. It should be a straight fast-forward. QA has been running
> my -fixes, and -nightly branches, which I've maintained as you do.
>
> The patches merged have all been either reviewed-by someone, and/or
> myself. I tried to merge all the easy to miss ones, and I avoided
> dangerous ones including big series.
>
> There were a couple of stray patches which I wasn't capable of
> reviewing, so you'll have to fish for those. In addition I've made
> bundles in patchwork for the series which got submitted that either had
> outstanding work, or needed review.
>
> Damien:
> http://patchwork.kernel.org/bundle/bwidawsk/infoframe%20fixes/
>
> Paulo:
> http://patchwork.kernel.org/bundle/bwidawsk/PC8+/
>
> Ben:
> http://patchwork.kernel.org/bundle/bwidawsk/VMAs%20v2/
>
> Ville (A lot of this is reviewed):
> http://patchwork.kernel.org/bundle/bwidawsk/watermarks/
>
>
> I won't be offended if you scrap this branch - as I said, it was
> primarily to quiet Jesse, and Chris.
>
> I hope you enjoyed your vacation :P

Was great ;-)

I've shuffled patches a bit (so that I could send a non-broken pull
request to Dave mostly), so didn't take your branch unchanged. I've
also dropped the hsw/iris pte stuff (will write replies to the
relevant patches later) and " drm: Remove unused
drm_mode_validate_clocks" since it's a drm core patch but lacked
Dave's ack.

I'll crawl through my mail backlog later ..

Thanks for doing this,
Daniel

>
> ---
>
> The following changes since commit fae5cbff3e3e4097de2e76178d462b90626c2bdb:
>
>   drm/i915: clean up crtc timings computation (2013-07-27 00:02:38 +0200)
>
> are available in the git repository at:
>
>   http://cgit.freedesktop.org/~bwidawsk/drm-intel/ drm-intel-next-queued
>
> for you to fetch changes up to 2178d41e557267cbb54dfef1353be31bc60b2245:
>
>   drm/i915: Do not dereference NULL crtc or fb until after checking (2013-08-02 14:13:45 -0700)
>
> ----------------------------------------------------------------
> Ben Widawsky (1):
>       drm/i915/hsw: Change default LLC age to 3
>
> Chris Wilson (5):
>       drm/i915: Squelch repeated reasoning for why FBC cannot be activated
>       drm/i915: Use the same pte_encoding for ppgtt as for gtt
>       drm/i915: Use Write-Through cacheing for the display plane on Iris
>       drm/i915: Tidy the macro casting by using an inline function
>       drm/i915: Do not dereference NULL crtc or fb until after checking
>
> Stéphane Marchesin (2):
>       drm/i915: Remove useless define
>       drm: Remove unused drm_mode_validate_clocks
>
>  drivers/gpu/drm/drm_modes.c          | 37 -------------------------------------
>  drivers/gpu/drm/i915/i915_debugfs.c  |  6 ++++++
>  drivers/gpu/drm/i915/i915_dma.c      |  3 +++
>  drivers/gpu/drm/i915/i915_drv.h      | 17 +++++++++++++----
>  drivers/gpu/drm/i915/i915_gem.c      | 34 +++++++++++++++++++++++-----------
>  drivers/gpu/drm/i915/i915_gem_gtt.c  | 22 +++++++++++++---------
>  drivers/gpu/drm/i915/intel_display.c |  1 -
>  drivers/gpu/drm/i915/intel_dp.c      |  9 +++++++++
>  drivers/gpu/drm/i915/intel_pm.c      | 59 +++++++++++++++++++++++++++++++++++++----------------------
>  include/drm/drm_crtc.h               |  3 ---
>  include/uapi/drm/i915_drm.h          |  1 +
>  11 files changed, 105 insertions(+), 87 deletions(-)
>
>
> --
> Ben Widawsky, Intel Open Source Technology Center



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