]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Don't try to look up object for non-existent fb
authorMatt Roper <matthew.d.roper@intel.com>
Wed, 25 Jun 2014 00:05:02 +0000 (17:05 -0700)
committerJani Nikula <jani.nikula@intel.com>
Wed, 25 Jun 2014 10:06:35 +0000 (13:06 +0300)
commited9fd1af4b5b42cf5f5578932042c5ae958085d7
treeeb1a912ec382c3229b75b5ad0e64824fe06de46f
parent8b27c14bb7cb3b40c68e5074caab89dc7147b413
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 8c77fa8a86a71a5387006283cb3f9543024d4e91
        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>
drivers/gpu/drm/i915/intel_display.c