Patch "drm/i915: Fix oops in overlay due to frontbuffer tracking" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/i915: Fix oops in overlay due to frontbuffer tracking
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-fix-oops-in-overlay-due-to-frontbuffer-tracking.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
9169757ae67bc927750ae907624e65cc15b4fe5aMon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <[email protected]>
Date: Wed, 7 Dec 2016 19:28:03 +0200
Subject: drm/i915: Fix oops in overlay due to frontbuffer tracking
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Ville Syrjälä <[email protected]>
commit 9169757ae67bc927750ae907624e65cc15b4fe5a upstream.
The vma will be NULL if the overlay was previously off, so dereferencing it will oops. Check for NULL before doing that.
--- drivers/gpu/drm/i915/intel_overlay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_overlay.c +2 -2
@@ -840,8 +840,8 @@ static int intel_overlay_do_put_image(stif (ret) goto out_unpin; -i915_gem_track_fb (overlay->vma->obj, new_bo, -INTEL_FRONTBUFFER_OVERLAY (pipe)); +i915_gem_track_fb (overlay->vma ? overlay->vma->obj :NULL , + vma->obj,INTEL_FRONTBUFFER_OVERLAY (pipe)); overlay->old_vma = overlay->vma; overlay->vma = vma;
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/drm-i915-fix-oopses-in-the-overlay-code-due-to-i915_gem_active-stuff.patch queue-4.9/drm-i915-initialize-overlay-last_flip-properly.patch queue-4.9/drm-i915-force-vdd-off-on-the-new-power-seqeuencer-before-starting-to-use-it.patch queue-4.9/drm-i915-fix-oops-in-overlay-due-to-frontbuffer-tracking.patch