diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-07-07 18:38:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-07-07 18:38:44 +1000 |
| commit | 102e73463e1bb921b3a829a1392a29dba16bbabd (patch) | |
| tree | 8c569c1a6a7fd3ffc21cf1780bd8fa62be5b23b2 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 5c8d7171cc4984351af802a525675d50ae555a7b (diff) | |
| parent | e5510fac98a706c424034950f55bb5e819c46f51 (diff) | |
Merge branch 'drm-tracepoints' into drm-testing
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 68dcf36e279..f879589bead 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -33,6 +33,7 @@ #include "intel_drv.h" #include "i915_drm.h" #include "i915_drv.h" +#include "i915_trace.h" #include "drm_dp_helper.h" #include "drm_crtc_helper.h" @@ -4650,6 +4651,8 @@ static void do_intel_finish_page_flip(struct drm_device *dev, atomic_dec_and_test(&obj_priv->pending_flip)) DRM_WAKEUP(&dev_priv->pending_flip_queue); schedule_work(&work->work); + + trace_i915_flip_complete(intel_crtc->plane, work->pending_flip_obj); } void intel_finish_page_flip(struct drm_device *dev, int pipe) @@ -4781,6 +4784,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, mutex_unlock(&dev->struct_mutex); + trace_i915_flip_request(intel_crtc->plane, obj); + return 0; } |