[SRU][F][PATCH 0/2] Replace a nasty i915 sauce patch with an upstream fix

[Sultan Alsawaf]

BugLink: https://bugs.launchpad.net/bugs/1877394

SRU Justification:

[Impact]
A sauce fix for a kernel panic in i915 that I frequently experienced was fixed
by upstream.

[Fix]
The sauce patch I made should be dropped in exchange for the proper upstream
fix.

[Test]
I tested the upstream fix and can confirm it fixes the crashes I experienced.

[Regression Potential]
Low. The upstream fix for this bug is tiny and we get to remove a nasty sauce
patch.

Chris Wilson (1):
  drm/i915/gt: Make intel_ring_unpin() safe for concurrent pint

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

 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 --
 4 files changed, 17 insertions(+), 57 deletions(-)

-- 
2.20.1