| commit | 842315ee7e416fa2f37c649c8a9ae6d6960b42a6 | [log] [tgz] |
|---|---|---|
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | Wed Aug 05 12:37:11 2015 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Fri Aug 14 17:50:36 2015 +0200 |
| tree | 4cd7249d3a67ee3bf0d576488775f0714f5709a7 | |
| parent | 4740b0f2b80cc7810bf5fa871189c318b08dbc46 [diff] |
drm/i915: Handle return value in intel_pin_and_fence_fb_obj, v2. -EDEADLK has special meaning in atomic, but get_fence may call i915_find_fence_reg which can return -EDEADLK. This has special meaning in the atomic world, so convert the error to -EBUSY for this case. Changes since v1: - Add comment in the code. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>