diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-15 12:01:23 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-15 12:01:23 +0800 |
| commit | 26c815656d14b133b04936f384f5a55fceb2e835 (patch) | |
| tree | 32a8db278aa1c4f21e05fcc12bd57c831116bb78 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 106bdd9b95b3da7d762c4e0e59427444ff9f455d (diff) | |
| parent | 57f53fd801a06aa1bfc6492737d70423ff9d3660 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 909d1d71d130..4f5d07bb3511 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3948,10 +3948,10 @@ static void page_flip_completed(struct intel_crtc *intel_crtc) drm_crtc_vblank_put(&intel_crtc->base); wake_up_all(&dev_priv->pending_flip_queue); - queue_work(dev_priv->wq, &work->work); - trace_i915_flip_complete(intel_crtc->plane, work->pending_flip_obj); + + queue_work(dev_priv->wq, &work->work); } void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc) |