Commit 9169757a authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Jani Nikula

drm/i915: Fix oops in overlay due to frontbuffer tracking

The vma will be NULL if the overlay was previously off, so
dereferencing it will oops. Check for NULL before doing that.

Cc: stable@vger.kernel.org
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Fixes: 9b3b7841 ("drm/i915/overlay: Use VMA as the primary tracker for images")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1481131693-27993-2-git-send-email-ville.syrjala@linux.intel.comReviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 4a15cdbb)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent b72eb5ff
...@@ -840,8 +840,8 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay, ...@@ -840,8 +840,8 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
if (ret) if (ret)
goto out_unpin; goto out_unpin;
i915_gem_track_fb(overlay->vma->obj, new_bo, i915_gem_track_fb(overlay->vma ? overlay->vma->obj : NULL,
INTEL_FRONTBUFFER_OVERLAY(pipe)); vma->obj, INTEL_FRONTBUFFER_OVERLAY(pipe));
overlay->old_vma = overlay->vma; overlay->old_vma = overlay->vma;
overlay->vma = vma; overlay->vma = vma;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment