From: Matt Roper <matthew.d.roper@intel.com>
Date: Wed, 25 Jun 2014 00:05:02 +0000 (-0700)
Subject: drm/i915: Don't try to look up object for non-existent fb
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~125^2~49^2~86^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91565c85b66db820f01894a971d39aaef60c4325;p=pandora-kernel.git

drm/i915: Don't try to look up object for non-existent fb

crtc->primary->fb may be NULL upon entry to intel_pipe_set_base() if the
primary plane has previously been disabled via the universal plane
interface.  We need to check for NULL before trying to reference
old_fb's obj.

This fixes a regression introduced in

        commit a071fa00647bc9a3c53f917b236fff9aea175e3a
        Author: Daniel Vetter <daniel.vetter@ffwll.ch>
        Date:   Wed Jun 18 23:28:09 2014 +0200

        drm/i915: Introduce accurate frontbuffer tracking

Testcase: igt/kms_universal_plane
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

Reading git-diff-tree failed