[PULL] drm-intel-next-fixes

[Jani Nikula]

On Wed, 30 Jun 2021, Rodrigo Vivi <rodrigo.vivi at intel.com> wrote:
> On Wed, Jun 30, 2021 at 01:05:35PM +0300, Jani Nikula wrote:
>> On Tue, 29 Jun 2021, Rodrigo Vivi <rodrigo.vivi at intel.com> wrote:
>> > Hi Dave and Daniel,
>> >
>> > Here goes drm-intel-next-fixes-2021-06-29:
>> >
>> > The biggest fix is the restoration of mmap ioctl for gen12 integrated parts
>> > which lack was breaking ADL-P with media stack.
>> > Besides that a small selftest fix and a theoretical overflow on
>> > i915->pipe_to_crtc_mapping.
>> 
>> My last fixes pull for v5.13 fell between the cracks [1]. There was one
>> stable worthy fix, but since it was still in drm-intel-fixes when you
>> ran dim cherry-pick-next-fixes, it was skipped for drm-intel-next-fixes.
>> 
>> I've now dropped the commit and pushed v5.13 to drm-intel-fixes, as
>> we're past that point. Subsequent dim cherry-pick-next-fixes should pick
>> it up now.
>
> it didn't, probably because the Fixes hash not being part of the drm-next yet?!

Odd, should be.

> I can cherry-pick that directly. Please let me know the commit id.

c88e2647c5bb ("drm/i915/display: Do not zero past infoframes.vsc")

Thanks,
Jani.


>
> Thanks,
> Rodrigo.
>
>> 
>> Please do another next fixes pull request with that. (It's okay to pull
>> this one already though, doesn't make a difference.)
>> 
>> 
>> BR,
>> Jani.
>> 
>> 
>> [1] https://lore.kernel.org/r/87czsbu15r.fsf@intel.com
>> 
>> 
>> 
>> >
>> > Thanks,
>> > Rodrigo.
>> >
>> > The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
>> >
>> >   Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
>> >
>> > are available in the Git repository at:
>> >
>> >   git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-fixes-2021-06-29
>> >
>> > for you to fetch changes up to c90c4c6574f3feaf2203b5671db1907a1e15c653:
>> >
>> >   drm/i915: Reinstate the mmap ioctl for some platforms (2021-06-28 07:43:56 -0400)
>> >
>> > ----------------------------------------------------------------
>> > The biggest fix is the restoration of mmap ioctl for gen12 integrated parts
>> > which lack was breaking ADL-P with media stack.
>> > Besides that a small selftest fix and a theoretical overflow on
>> > i915->pipe_to_crtc_mapping.
>> >
>> > ----------------------------------------------------------------
>> > Chris Wilson (1):
>> >       drm/i915/selftests: Reorder tasklet_disable vs local_bh_disable
>> >
>> > Jani Nikula (1):
>> >       drm/i915/dsc: abstract helpers to get bigjoiner primary/secondary crtc
>> >
>> > Thomas Hellström (1):
>> >       drm/i915: Reinstate the mmap ioctl for some platforms
>> >
>> >  drivers/gpu/drm/i915/display/intel_display.c       |  7 ++-
>> >  drivers/gpu/drm/i915/display/intel_display_types.h |  8 ++++
>> >  drivers/gpu/drm/i915/display/intel_vdsc.c          | 40 +++++++++++-----
>> >  drivers/gpu/drm/i915/display/intel_vdsc.h          |  1 +
>> >  drivers/gpu/drm/i915/gem/i915_gem_mman.c           |  7 +--
>> >  drivers/gpu/drm/i915/gt/selftest_execlists.c       | 55 +++++++++++++---------
>> >  6 files changed, 76 insertions(+), 42 deletions(-)
>> 
>> -- 
>> Jani Nikula, Intel Open Source Graphics Center

-- 
Jani Nikula, Intel Open Source Graphics Center