On Fri, Mar 21, 2014 at 05:51:01PM -0700, Ben Widawsky wrote: > Let's try this again. I've pushed a branch here: > http://cgit.freedesktop.org/~bwidawsk/drm-intel/log/?h=bdw-backports > > I need to re-review some of the merge conflicts for 4g GGTT, which I > will try to do before Monday. > > Daniel: please make sure this is what you had in mind. I don't know > where you want Cc: stable tags.
We don't need cc: stable, we just need to submit it (since it has the upstream sha1s already, which is the requirement for stable patches). Cc: stable is only for when you want it to get backport anyway. Otherwise looks good. I dunno whether git cherry-pick can be told to use the sha1 reference layout Greg prefers or not, he uses "This is <sha1> in upstream." between the commit header and the actual commit message. But ime his scripts reformat your commit messages anyway. > James: please test this as soon as possible. Once this is tested and we conclude it's sufficient to get bdw going on 3.14 without hilarity I think we should do a quick review on intel-gfx to check that the impact outside of bdw is indeed minimal. Then once drm-next has landed with all the referenced commits we can submit it to Greg with a small cover letter why we want this and that plan B would be to kill bdw in 3.14. Thanks for doing this, Daniel > > Thanks. > > > On Fri, Mar 21, 2014 at 11:48:09AM -0700, Ben Widawsky wrote: > > The following patches are the backported "simple" fixes for 3.14. Some > > of these already had Cc: stable on them, but required conflict > > resolution which I've provided (presumably they canbe dropped if it's > > easier for upstream). There will be another series of backports which > > has fixes that require more than a single patch. > > > > I will not have a machine to test these on until Monday, but I am > > mailing them out now in case our QA can get it tested sooner. > > > > Ben Widawsky (2): > > drm/i915/bdw: Use scratch page table for GEN8 PPGTT > > drm/i915/bdw: Restore PPAT on thaw > > > > Damien Lespiau (1): > > drm/i915/bdw: The TLB invalidation mechanism has been removed from > > INSTPM > > > > Jani Nikula (1): > > drm/i915: don't flood the logs about bdw semaphores > > > > Kenneth Graunke (2): > > drm/i915: Add a partial instruction shootdown workaround on Broadwell. > > drm/i915: Add thread stall DOP clock gating workaround on Broadwell. > > > > Mika Kuoppala (2): > > drm/i915: Fix forcewake counts for gen8 > > drm/i915: Do forcewake reset on gen8 > > > > Ville Syrjälä (4): > > drm/i915: Disable semaphore wait event idle message on BDW > > drm/i915: Implement WaDisableSDEUnitClockGating:bdw > > drm/i915: We implement WaDisableAsyncFlipPerfMode:bdw > > drm/i915: Don't clobber CHICKEN_PIPESL_1 on BDW > > > > drivers/gpu/drm/i915/i915_drv.c | 5 ++++- > > drivers/gpu/drm/i915/i915_gem_gtt.c | 7 +++++++ > > drivers/gpu/drm/i915/i915_reg.h | 10 ++++++++++ > > drivers/gpu/drm/i915/intel_pm.c | 18 ++++++++++++++++-- > > drivers/gpu/drm/i915/intel_ringbuffer.c | 12 +++++++++--- > > drivers/gpu/drm/i915/intel_uncore.c | 29 +++++++++++++++-------------- > > 6 files changed, 61 insertions(+), 20 deletions(-) > > > > -- > > 1.9.1 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Ben Widawsky, Intel Open Source Technology Center -- 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
