Fix pointer tests in error-handling paths
authorDave Gordon <david.s.gordon@intel.com>
Thu, 28 Jan 2016 10:48:09 +0000 (10:48 +0000)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Thu, 28 Jan 2016 17:42:14 +0000 (17:42 +0000)
commit0aa498d59c67d925f2a53fdffd1d447727d65c22
tree98acd0d5095243c99add7d63117f4c765f29bf7f
parentf4e2deceb6aaab661be3e13191cd13da3dd3b9c2
Fix pointer tests in error-handling paths

In the error-handling paths of i915_gem_do_execbuffer() and
intel_crtc_page_flip(), the local pointer-to-request variables
were expected to be either valid pointers or NULL. Since

  2682708 drm/i915: simplify allocation of driver-internal requests

they could also be ERR_PTR() values, so the tests need to be
updated to accommodate this case.

Signed-off-by: Dave Gordon <david.s.gordon@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453978089-29127-1-git-send-email-tvrtko.ursulin@linux.intel.com
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/intel_display.c