add debug log

Signed-off-by: Xue, Bosheng <bosheng.xue@intel.com>

Author: bosheng1

drivers/dma-buf/dma-fence.c

@@ -27,6 +27,8 @@ EXPORT_TRACEPOINT_SYMBOL(dma_fence_signaled);
 static DEFINE_SPINLOCK(dma_fence_stub_lock);
 static struct dma_fence dma_fence_stub;
 
+static u64 seqno_crtc_0 = 0;
+static u64 seqno_crtc_1 = 0;
 /*
  * fence context counter: each execution context should have its own
  * fence context, this allows checking if fences belong to the same
@@ -369,6 +371,27 @@ int dma_fence_signal_timestamp_locked(struct dma_fence *fence,
 {
 	struct dma_fence_cb *cur, *tmp;
 	struct list_head cb_list;
+	char *timeline = NULL;
+
+	timeline = fence->ops->get_timeline_name(fence);
+	if (timeline) {
+		if (strstr(timeline, "crtc-0")) {
+			if (seqno_crtc_0 == 0)
+				seqno_crtc_0 = fence->seqno;
+			if (fence->seqno != (seqno_crtc_0 +1)) {
+				trace_printk("crtc-0 miss seq from %llx to %llx\n", seqno_crtc_0, fence->seqno);
+			}
+			seqno_crtc_0 = fence->seqno;
+		}
+		if (strstr(timeline, "crtc-1")) {
+			if (seqno_crtc_1 == 0)
+				seqno_crtc_1 = fence->seqno;
+			if (fence->seqno != (seqno_crtc_1 +1)) {
+				trace_printk("crtc-1 miss seq from %llx to %llx\n", seqno_crtc_1, fence->seqno);
+			}
+			seqno_crtc_1 = fence->seqno;
+		}
+	}
 
 	lockdep_assert_held(fence->lock);
 

drivers/gpu/drm/drm_atomic_helper.c

@@ -827,7 +827,7 @@ drm_atomic_helper_check_wb_encoder_state(struct drm_encoder *encoder,
 		if (fb->format->format == formats[i])
 			return 0;
 
-	drm_dbg_kms(encoder->dev, "Invalid pixel format %p4cc\n", &fb->format->format);
+	drm_warn(encoder->dev, "Invalid pixel format %p4cc\n", &fb->format->format);
 
 	return -EINVAL;
 }
@@ -885,7 +885,7 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
 	}
 
 	if (!crtc_state->enable && !can_update_disabled) {
-		drm_dbg_kms(plane_state->plane->dev,
+		drm_warn(plane_state->plane->dev,
 			    "Cannot update plane of a disabled CRTC.\n");
 		return -EINVAL;
 	}
@@ -896,7 +896,7 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
 	hscale = drm_rect_calc_hscale(src, dst, min_scale, max_scale);
 	vscale = drm_rect_calc_vscale(src, dst, min_scale, max_scale);
 	if (hscale < 0 || vscale < 0) {
-		drm_dbg_kms(plane_state->plane->dev,
+		drm_warn(plane_state->plane->dev,
 			    "Invalid scaling of plane\n");
 		drm_rect_debug_print("src: ", &plane_state->src, true);
 		drm_rect_debug_print("dst: ", &plane_state->dst, false);
@@ -921,7 +921,7 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
 		return 0;
 
 	if (!can_position && !drm_rect_equals(dst, &clip)) {
-		drm_dbg_kms(plane_state->plane->dev,
+		drm_warn(plane_state->plane->dev,
 			    "Plane must cover entire CRTC\n");
 		drm_rect_debug_print("dst: ", dst, false);
 		drm_rect_debug_print("clip: ", &clip, false);
@@ -1612,9 +1612,17 @@ int drm_atomic_helper_wait_for_fences(struct drm_device *dev,
 		 * still interrupt the operation. Instead of blocking until the
 		 * timer expires, make the wait interruptible.
 		 */
-		ret = dma_fence_wait(new_plane_state->fence, pre_swap);
-		if (ret)
+//		ret = dma_fence_wait(new_plane_state->fence, pre_swap);
+//		if (ret)
+//			return ret;
+		ret = dma_fence_wait_timeout(fence, pre_swap, msecs_to_jiffies(5000));
+		if (ret = 0) {
+			DRM_ERROR("drm_atomic_helper_wait_for_fences timeout\n");
+		}
+		if (ret < 0) {
+			DRM_ERROR("drm_atomic_helper_wait_for_fences error:%d\n", ret);
 			return ret;
+		}
 
 		dma_fence_put(new_plane_state->fence);
 		new_plane_state->fence = NULL;

drivers/gpu/drm/drm_atomic_uapi.c

@@ -1313,6 +1313,7 @@ static void complete_signaling(struct drm_device *dev,
 		 * to prevent a double free in drm_atomic_state_clear.
 		 */
 		if (event && (event->base.fence || event->base.file_priv)) {
+			DRM_ERROR("complete_signaling event cancel\n")
 			drm_event_cancel_free(dev, &event->base);
 			crtc_state->event = NULL;
 		}
@@ -1330,7 +1331,7 @@ static void complete_signaling(struct drm_device *dev,
 		/* If this fails log error to the user */
 		if (fence_state[i].out_fence_ptr &&
 		    put_user(-1, fence_state[i].out_fence_ptr))
-			drm_dbg_atomic(dev, "Couldn't clear out_fence_ptr\n");
+			drm_warn(dev, "Couldn't clear out_fence_ptr\n");
 	}
 
 	kfree(fence_state);

drivers/gpu/drm/drm_framebuffer.c

@@ -404,7 +404,7 @@ static void drm_mode_rmfb_work_fn(struct work_struct *w)
 		struct drm_framebuffer *fb =
 			list_first_entry(&arg->fbs, typeof(*fb), filp_head);
 
-		drm_dbg_kms(fb->dev,
+		drm_warn(fb->dev,
 			    "Removing [FB:%d] from all active usage due to RMFB ioctl\n",
 			    fb->base.id);
 		list_del_init(&fb->filp_head);
@@ -984,7 +984,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
 		if (plane->state->fb != fb)
 			continue;
 
-		drm_dbg_kms(dev,
+		drm_warn(dev,
 			    "Disabling [PLANE:%d:%s] because [FB:%d] is removed\n",
 			    plane->base.id, plane->name, fb->base.id);
 
@@ -997,7 +997,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
 		if (disable_crtcs && plane_state->crtc->primary == plane) {
 			struct drm_crtc_state *crtc_state;
 
-			drm_dbg_kms(dev,
+			drm_warn(dev,
 				    "Disabling [CRTC:%d:%s] because [FB:%d] is removed\n",
 				    plane_state->crtc->base.id,
 				    plane_state->crtc->name, fb->base.id);

drivers/gpu/drm/virtio/virtgpu_display.c

@@ -147,6 +147,9 @@ static void virtio_gpu_crtc_atomic_disable(struct drm_crtc *crtc,
 	virtio_gpu_notify(vgdev);
 }
 
+static u64 seqno_crtc_0 = 0;
+static u64 seqno_crtc_1 = 0;
+
 static void virtio_gpu_crtc_atomic_begin(struct drm_crtc *crtc,
 					 struct drm_atomic_state *state)
 {
@@ -158,6 +161,30 @@ static void virtio_gpu_crtc_atomic_begin(struct drm_crtc *crtc,
 	if (!vgdev->has_vblank || !crtc->state->event)
 		return;
 
+       char *timeline = NULL;
+       struct dma_fence *fence = NULL;
+       fence = e->base.fence;
+       if (fence)
+	       timeline = fence->ops->get_timeline_name(fence);
+       if (timeline) {
+               if (strstr(timeline, "crtc-0")) {
+                       if (seqno_crtc_0 == 0)
+                               seqno_crtc_0 = fence->seqno;
+                       if (fence->seqno != (seqno_crtc_0 +1)) {
+                               trace_printk("atomic begin crtc-0 miss seq from %llx to %llx\n", seqno_crtc_0, fence->seqno);
+                       }
+                       seqno_crtc_0 = fence->seqno;
+               }
+               if (strstr(timeline, "crtc-1")) {
+                       if (seqno_crtc_1 == 0)
+                               seqno_crtc_1 = fence->seqno;
+                       if (fence->seqno != (seqno_crtc_1 +1)) {
+                               trace_printk("atomic begin crtc-1 miss seq from %llx to %llx\n", seqno_crtc_1, fence->seqno);
+                       }
+                       seqno_crtc_1 = fence->seqno;
+               }
+       }
+
 	if (drm_crtc_vblank_get(crtc)) {
 		/* Cannot enable vblank, send it right now. */
 		spin_lock_irq(&drm->event_lock);