[PULL] drm-intel-fixes

[Daniel Vetter]

On Fri, Dec 30, 2022 at 04:59:38AM -0500, Rodrigo Vivi wrote:
> Hi Dave and Daniel,
> 
> Here goes the initial fixes for 6.2.
> 
> The most critical ones seems to be the evict fix from Matt and
> the MIPI DSI from Jani. Both targeting stable trees.
> 
> I'm sorry for sending this on a Friday and not on a Thursday as
> usual. Where did this week go? Worst case this wait one week
> and I get it rebased and resent earlier next week.
> 
> Where did 2022 go? Happy New Year!

Cheers to you too!

> Cheers,
> Rodrigo.
> 
> 
> drm-intel-fixes-2022-12-30:
> - fix TLB invalidation for DG2 and newer platforms. (Andrzej)
> - Remove __maybe_unused from mtl_info (Lucas)
> - improve the catch-all evict to handle lock contention (Matt Auld)
> - Fix two issues with over-size (GuC/HuC) firmware files (John)
> - Fix DSI resume issues on ICL+ (Jani)
> 
> Thanks,
> Rodrigo.
> 
> The following changes since commit 1b929c02afd37871d5afb9d498426f83432e71c2:
> 
>   Linux 6.2-rc1 (2022-12-25 13:41:39 -0800)
> 
> are available in the Git repository at:
> 
>   git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2022-12-30

Pulled, I'll try to get it out for Linus to include it in -rc2 still.

> for you to fetch changes up to 6217e9f05a74df48c77ee68993d587cdfdb1feb7:
> 
>   drm/i915/dsi: fix MIPI_BKLT_EN_1 native GPIO index (2022-12-30 04:28:46 -0500)
> 
> ----------------------------------------------------------------
> - fix TLB invalidation for DG2 and newer platforms. (Andrzej)
> - Remove __maybe_unused from mtl_info (Lucas)
> - improve the catch-all evict to handle lock contention (Matt Auld)

Just a quick comment, this one has

Fixes: 7e00897be8bf ("drm/i915: Add object locking to i915_gem_evict_for_node and i915_gem_evict_something, v2.")

but I don't think that's entirely accurate. I might mix up some details
(and today is not the day to dig these out) and it's been two years
already when I discussed this Maarten, but this issue is older. It got
introduced with the conversion to per-object locking, and then somewhat
artfully papered over with the async object pinning infrastructure (which
had the design issue of being flat out in violation of upstream locking
hierarchy).

In practice it makes no difference, because there's no way you can
backport any of this to a point before the locking rework from Maarten (or
alternatively, revert until the glorious struct_mutex days). A bit more
review on a core locking change like this would have been good though imo.

Cheers, Daniel

> - Fix two issues with over-size (GuC/HuC) firmware files (John)
> - Fix DSI resume issues on ICL+ (Jani)
> 
> ----------------------------------------------------------------
> Andrzej Hajda (1):
>       drm/i915: fix TLB invalidation for Gen12.50 video and compute engines
> 
> Jani Nikula (2):
>       drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence
>       drm/i915/dsi: fix MIPI_BKLT_EN_1 native GPIO index
> 
> John Harrison (1):
>       drm/i915/uc: Fix two issues with over-size firmware files
> 
> Lucas De Marchi (1):
>       drm/i915: Remove __maybe_unused from mtl_info
> 
> Matthew Auld (1):
>       drm/i915: improve the catch-all evict to handle lock contention
> 
>  drivers/gpu/drm/i915/display/intel_dsi_vbt.c    | 94 ++++++++++++++++++++++++-
>  drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c  | 59 +++++++++++++---
>  drivers/gpu/drm/i915/gem/i915_gem_mman.c        |  2 +-
>  drivers/gpu/drm/i915/gt/intel_gt.c              |  8 ++-
>  drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c        | 42 +++++++----
>  drivers/gpu/drm/i915/i915_gem_evict.c           | 37 +++++++---
>  drivers/gpu/drm/i915/i915_gem_evict.h           |  4 +-
>  drivers/gpu/drm/i915/i915_irq.c                 |  3 +
>  drivers/gpu/drm/i915/i915_pci.c                 |  1 -
>  drivers/gpu/drm/i915/i915_reg.h                 |  1 +
>  drivers/gpu/drm/i915/i915_vma.c                 |  2 +-
>  drivers/gpu/drm/i915/selftests/i915_gem_evict.c |  4 +-
>  12 files changed, 212 insertions(+), 45 deletions(-)

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch