On Tue, Nov 15, 2016 at 08:58:15AM +0000, Chris Wilson wrote:
> @@ -12340,7 +12325,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
> cleanup_request:
> i915_add_request_no_flush(request);
> cleanup_unpin:
> - intel_unpin_fb_obj(fb, crtc->primary->state->rotation);
> + to_intel_plane_state(primary->state)->vma = work->old_vma;
> + intel_unpin_fb_vma(vma);
> cleanup_pending:
> atomic_dec(&intel_crtc->unpin_work_count);
> mutex_unlock(&dev->struct_mutex);
> @@ -14234,10 +14220,10 @@ intel_prepare_plane_fb(struct drm_plane *plane,
> struct i915_vma *vma;
>
> vma = intel_pin_and_fence_fb_obj(fb, new_state->rotation);
> - if (IS_ERR(vma)) {
> - DRM_DEBUG_KMS("failed to pin object\n");
> - return PTR_ERR(vma);
> - }
> + if (IS_ERR(vma))
> + ret = PTR_ERR(vma);
Uncessary change above that you then go ahead and partially undo in the
next patch. Please remove.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
