Commit 0aa498d5 authored by Dave Gordon's avatar Dave Gordon Committed by Tvrtko Ursulin

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

  26827088 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: default avatarDave Gordon <david.s.gordon@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453978089-29127-1-git-send-email-tvrtko.ursulin@linux.intel.com
parent f4e2dece
...@@ -1655,7 +1655,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, ...@@ -1655,7 +1655,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
* must be freed again. If it was submitted then it is being tracked * must be freed again. If it was submitted then it is being tracked
* on the active request list and no clean up is required here. * on the active request list and no clean up is required here.
*/ */
if (ret && req) if (ret && !IS_ERR_OR_NULL(req))
i915_gem_request_cancel(req); i915_gem_request_cancel(req);
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
......
...@@ -11726,7 +11726,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, ...@@ -11726,7 +11726,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
cleanup_unpin: cleanup_unpin:
intel_unpin_fb_obj(fb, crtc->primary->state); intel_unpin_fb_obj(fb, crtc->primary->state);
cleanup_pending: cleanup_pending:
if (request) if (!IS_ERR_OR_NULL(request))
i915_gem_request_cancel(request); i915_gem_request_cancel(request);
atomic_dec(&intel_crtc->unpin_work_count); atomic_dec(&intel_crtc->unpin_work_count);
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
......
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