[SRU][F][PATCH 0/4] Upstream fixes for two i915 crashes

Sultan Alsawaf sultan.alsawaf at canonical.com
Thu May 7 15:31:32 UTC 2020


This patchset does two things: it adds a fix for the #1868551 crash and it
removes a sauce fix for the #1877394 crash in favor of a small upstream fix for
the issue.

These patches have been tested with positive results, fixing the issues in their
respective bug numbers.

The regression potential is low. These are compact upstream fixes that are known
to work, and we get to drop a nasty sauce patch.

Chris Wilson (2):
  drm/i915: Hold reference to intel_frontbuffer as we track activity
  drm/i915/gt: Make intel_ring_unpin() safe for concurrent pint

Colin Ian King (1):
  drm/i915: fix uninitialized pointer reads on pointers to and from

Sultan Alsawaf (1):
  Revert "UBUNTU: SAUCE: drm/i915: Synchronize active and retire
    callbacks"

 drivers/gpu/drm/i915/display/intel_display.c  |  2 +-
 .../gpu/drm/i915/display/intel_frontbuffer.c  | 16 +++----
 .../gpu/drm/i915/display/intel_frontbuffer.h  | 34 +++++++++++--
 drivers/gpu/drm/i915/display/intel_overlay.c  | 17 +++++--
 drivers/gpu/drm/i915/gem/i915_gem_clflush.c   |  3 +-
 drivers/gpu/drm/i915/gem/i915_gem_domain.c    |  4 +-
 drivers/gpu/drm/i915/gem/i915_gem_object.c    | 26 +++++++++-
 drivers/gpu/drm/i915/gem/i915_gem_object.h    | 23 ++++++++-
 .../gpu/drm/i915/gem/i915_gem_object_types.h  |  2 +-
 drivers/gpu/drm/i915/gt/intel_ringbuffer.c    | 13 ++---
 drivers/gpu/drm/i915/i915_active.c            | 48 +++----------------
 drivers/gpu/drm/i915/i915_active.h            | 10 ++--
 drivers/gpu/drm/i915/i915_active_types.h      |  3 --
 drivers/gpu/drm/i915/i915_gem.c               | 10 ++--
 drivers/gpu/drm/i915/i915_vma.c               | 14 ++++--
 15 files changed, 135 insertions(+), 90 deletions(-)

-- 
2.20.1




More information about the kernel-team mailing list