[PULL] drm-intel-fixes v2

Ville Syrjälä ville.syrjala at linux.intel.com
Wed Dec 9 12:11:42 UTC 2020


On Thu, Dec 03, 2020 at 05:47:05AM -0800, Rodrigo Vivi wrote:
> Hi Dave and Daniel,
> 
> Please ignore the pull request I had sent yesterday and use only this one.
> 
> I had missed one patch: 14d1eaf08845 ("drm/i915/gt: Protect context lifetime with RCU").
> 
> Also, please notice that the commit 6db58901c2aa ("drm/i915/display: return earlier from
> +intel_modeset_init() without display") was not actually a crucial fix, but it
> +allowed a clean pick of the use-after-free one.
> 
> Here goes drm-intel-fixes-2020-12-03:
> Fixes for GPU hang, null dereference, suspend-resume, power consumption, and use-after-free.
> 
> - Program mocs:63 for cache eviction on gen9 (Chris)
> - Protect context lifetime with RCU (Chris)
> - Split the breadcrumb spinlock between global and contexts (Chris)
> - Retain default context state across shrinking (Venkata)
> - Limit frequency drop to RPe on parking (Chris)
> - Return earlier from intel_modeset_init() without display (Jani)
> - Defer initial modeset until after GGTT is initialized (Chris)
> 
> Thanks,
> Rodrigo.
> 
> The following changes since commit b65054597872ce3aefbc6a666385eabdf9e288da:
> 
>   Linux 5.10-rc6 (2020-11-29 15:50:50 -0800)
> 
> are available in the Git repository at:
> 
>   git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2020-12-03
> 
> for you to fetch changes up to ccc9e67ab26feda7e62749bb54c05d7abe07dca9:
> 
>   drm/i915/display: Defer initial modeset until after GGTT is initialised (2020-12-02 17:05:58 -0800)
> 
> ----------------------------------------------------------------
> Fixes for GPU hang, null dereference, suspend-resume, power consumption, and use-after-free.
> 
> - Program mocs:63 for cache eviction on gen9 (Chris)
> - Protect context lifetime with RCU (Chris)
> - Split the breadcrumb spinlock between global and contexts (Chris)
> - Retain default context state across shrinking (Venkata)
> - Limit frequency drop to RPe on parking (Chris)
> - Return earlier from intel_modeset_init() without display (Jani)
> - Defer initial modeset until after GGTT is initialized (Chris)
> 
> ----------------------------------------------------------------
> Chris Wilson (5):
>       drm/i915/gt: Program mocs:63 for cache eviction on gen9

That also needs
commit 444fbf5d7058 ("drm/i915/gt: Declare gen9 has 64 mocs entries!")
which seems to have not made it into this pull.

>       drm/i915/gt: Protect context lifetime with RCU
>       drm/i915/gt: Split the breadcrumb spinlock between global and contexts
>       drm/i915/gt: Limit frequency drop to RPe on parking
>       drm/i915/display: Defer initial modeset until after GGTT is initialised
> 
> Jani Nikula (1):
>       drm/i915/display: return earlier from intel_modeset_init() without display
> 
> Venkata Ramana Nayana (1):
>       drm/i915/gt: Retain default context state across shrinking
> 
>  drivers/gpu/drm/i915/display/intel_display.c      |  24 ++--
>  drivers/gpu/drm/i915/gt/intel_breadcrumbs.c       | 168 ++++++++++------------
>  drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h |   6 +-
>  drivers/gpu/drm/i915/gt/intel_context.c           |  15 +-
>  drivers/gpu/drm/i915/gt/intel_context_types.h     |  23 ++-
>  drivers/gpu/drm/i915/gt/intel_mocs.c              |  14 +-
>  drivers/gpu/drm/i915/gt/intel_rps.c               |   4 +
>  drivers/gpu/drm/i915/gt/shmem_utils.c             |   7 +-
>  drivers/gpu/drm/i915/i915_request.h               |   6 +-
>  9 files changed, 143 insertions(+), 124 deletions(-)
> _______________________________________________
> dim-tools mailing list
> dim-tools at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools

-- 
Ville Syrjälä
Intel


More information about the dri-devel mailing list