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

Fri Oct 19 09:41:48 UTC 2018

Quoting Daniel Vetter (2018-10-19 10:05:32)
> On Fri, Oct 19, 2018 at 8:59 AM Joonas Lahtinen
> <joonas.lahtinen at linux.intel.com> wrote:
> >
> > Quoting Daniel Vetter (2018-10-18 22:32:00)
> > > On Thu, Oct 18, 2018 at 6:57 PM Joonas Lahtinen
> > > <joonas.lahtinen at linux.intel.com> wrote:
> > > >
> > > > Hi Dave,
> > > >
> > > > Here comes the final set of fixes under -next-fixes umbrella.
> > > > Next one will be then from -fixes, assuming a release next Sun.
> > > >
> > > > Fixes for bunch of display related issues reported by users, then the
> > > > MST fixes that were dropped from Rodrigos PR + further Icelake fixes
> > > > and proactive improvements picked by tooling.
> > > >
> > > > Excuse for the slight accumulation as I skipped last week due to
> > > > travel like I warned.
> > > >
> > > > Regards, Joonas
> > > >
> > > > ***
> > > >
> > > > drm-intel-next-fixes-2018-10-18:
> > > > - Fix GPU hang on MacBook2,1 when booting in EFI mode (Bugzilla #105637)
> > > > - Fix garbled console on Y tiled BIOS framebuffer configs (Bugzilla #108264)
> > > > - Fix black screen on certain eDP panels eg. Dell XPS 9350 (Bugzilla #107489 and #105338)
> > > > - MST fixes that Rodrigo dropped from drm-intel-fixes and bunch of Icelake fixes
> > >
> > > This won't work because it doesn't contain Lyude's core fix (+ the 2
> > > fixups). You either need to cherry-pick all of them (and then probably
> > > include the nouveau one), or none of them. Did the cherry-pick script
> > > not propose them, or something else? They're all cc: stable.
> >
> > cherry-pick-next-fixes did not propose more. I did specifically ask
> > Rodrigo to drop the relevant stuff from drm-intel-fixes so that the
> > tooling would pick it up. What is there that is missing?
> 
> dim cherry-pick-branch is limited to drivers/gpu/drm/i915 :-(
> 
> Remove that (well at least only filter drm/) and you should see them.
> Ideally you put the core patch + 2 core fixups before the i915/nouveau
> patches.
> 
> I guess putting core patches that are bugfixes through drm-intel.git
> really isn't a good idea with our process ...

I've now done this now. Removal of the filter adding two patches, but I
had to track down the further Fixes: to Fixes: manually. Thanks to
Daniel for the assistance in pointing the missing patches.

As you already pulled this PR, the core fixes will end up after
the i915 fixes. If you end up wanting to rebase the order, note that
the Fixes: annotations will be wrecked. I'll send a further fixup PR.

I also amended the Fixes: tags to point to cherry-picked fixes, to
decrease the likelihood of falling through automated tooling (while
appending Cc: stable to one patch missing it).

So you want to avoid rebasing the patches in all circumstances (or
you have to update/remove the Fixes: lines beyond the line "(cherry
picked from ...".

Lovely thing to do on Friday :) Hopefully next week will be less
of a hassle.

Regards, Joonas

> -Daniel
> 
> >
> > Regards, Joonas
> >
> > > -Daniel
> > >
> > > > - Then assorted proactive code fixes caught by CI or developers
> > > >
> > > > The following changes since commit ca4b869240d5810ebac6b1570ad7beffcfbac2f5:
> > > >
> > > >   Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-next (2018-10-11 14:53:45 +1000)
> > > >
> > > > are available in the Git repository at:
> > > >
> > > >   git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-fixes-2018-10-18
> > > >
> > > > for you to fetch changes up to 835fe6d75d14c1513910ed7f5665127fee12acc8:
> > > >
> > > >   firmware/dmc/icl: Add missing MODULE_FIRMWARE() for Icelake. (2018-10-18 10:36:10 +0300)
> > > >
> > > > ----------------------------------------------------------------
> > > > - Fix GPU hang on MacBook2,1 when booting in EFI mode (Bugzilla #105637)
> > > > - Fix garbled console on Y tiled BIOS framebuffer configs (Bugzilla #108264)
> > > > - Fix black screen on certain eDP panels eg. Dell XPS 9350 (Bugzilla #107489 and #105338)
> > > > - MST fixes that Rodrigo dropped from drm-intel-fixes and bunch of Icelake fixes
> > > > - Then assorted proactive code fixes caught by CI or developers
> > > >
> > > > ----------------------------------------------------------------
> > > > Anusha Srivatsa (1):
> > > >       firmware/dmc/icl: Add missing MODULE_FIRMWARE() for Icelake.
> > > >
> > > > Chris Wilson (3):
> > > >       drm/i915: Only reset seqno if actually idle
> > > >       drm/i915/selftests: Disable shrinker across mmap-exhaustion
> > > >       drm/i915: Large page offsets for pread/pwrite
> > > >
> > > > Imre Deak (1):
> > > >       drm/i915/gen9+: Fix initial readout for Y tiled framebuffers
> > > >
> > > > Lyude Paul (3):
> > > >       drm/i915: Don't unset intel_connector->mst_port
> > > >       drm/i915: Skip vcpi allocation for MSTB ports that are gone
> > > >       drm/i915: Fix intel_dp_mst_best_encoder()
> > > >
> > > > Mahesh Kumar (2):
> > > >       drm/i915/icl: create function to identify combophy port
> > > >       drm/i915/icl: Fix DDI/TC port clk_off bits
> > > >
> > > > Manasi Navare (1):
> > > >       drm/i915/dp: Link train Fallback on eDP only if fallback link BW can fit panel's native mode
> > > >
> > > > Rodrigo Vivi (1):
> > > >       drm/i915/icl: Fix signal_levels
> > > >
> > > > Ville Syrjälä (3):
> > > >       drm/i915: Check fb stride against plane max stride
> > > >       drm/i915: Restore vblank interrupts earlier
> > > >       drm/i915: Use the correct crtc when sanitizing plane mapping
> > > >
> > > >  drivers/gpu/drm/i915/i915_debugfs.c              |   2 +-
> > > >  drivers/gpu/drm/i915/i915_gem.c                  |  12 +-
> > > >  drivers/gpu/drm/i915/i915_reg.h                  |   3 +
> > > >  drivers/gpu/drm/i915/intel_csr.c                 |   1 +
> > > >  drivers/gpu/drm/i915/intel_ddi.c                 |  36 ++++--
> > > >  drivers/gpu/drm/i915/intel_display.c             | 151 ++++++++++++++++-------
> > > >  drivers/gpu/drm/i915/intel_dp.c                  |  32 ++++-
> > > >  drivers/gpu/drm/i915/intel_dp_link_training.c    |  26 ++--
> > > >  drivers/gpu/drm/i915/intel_dp_mst.c              |  41 +++---
> > > >  drivers/gpu/drm/i915/intel_drv.h                 |   2 +
> > > >  drivers/gpu/drm/i915/intel_sprite.c              |  22 ++++
> > > >  drivers/gpu/drm/i915/selftests/i915_gem_object.c |   3 +
> > > >  12 files changed, 227 insertions(+), 104 deletions(-)
> > >
> > >
> > >
> > > --
> > > 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