diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2015-08-05 12:37:11 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-08-14 17:50:36 +0200 |
| commit | 842315ee7e416fa2f37c649c8a9ae6d6960b42a6 (patch) | |
| tree | 4cd7249d3a67ee3bf0d576488775f0714f5709a7 /drivers/gpu/drm/i915 | |
| parent | 4740b0f2b80cc7810bf5fa871189c318b08dbc46 (diff) | |
| download | blackbird-obmc-linux-842315ee7e416fa2f37c649c8a9ae6d6960b42a6.tar.gz blackbird-obmc-linux-842315ee7e416fa2f37c649c8a9ae6d6960b42a6.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index dc4812a493f5..16c8052f7eab 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2397,7 +2397,18 @@ intel_pin_and_fence_fb_obj(struct drm_plane *plane, * a fence as the cost is not that onerous. */ ret = i915_gem_object_get_fence(obj); - if (ret) + if (ret == -EDEADLK) { + /* + * -EDEADLK means there are no free fences + * no pending flips. + * + * This is propagated to atomic, but it uses + * -EDEADLK to force a locking recovery, so + * change the returned error to -EBUSY. + */ + ret = -EBUSY; + goto err_unpin; + } else if (ret) goto err_unpin; i915_gem_object_pin_fence(obj); |
