diff mbox

drm/i915: suppress automic commit error message under gvt-g env

Message ID 1488493124-21781-1-git-send-email-bing.niu@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

bing.niu@intel.com March 2, 2017, 10:18 p.m. UTC 
From: Bing Niu <bing.niu@intel.com>

under virtualization enviroment, it is possible guest update pipe
registers across vblank intervals due to delay of mmio trap or vm
schedule out. However, it is safe since those pipe update happen in
virual registers and will not commit to hardware. suppress that
automic commit error message under virtualization case to avoid
confuse user.

Signed-off-by: Bing Niu <bing.niu@intel.com>
---
 drivers/gpu/drm/i915/intel_sprite.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

bing.niu@intel.com March 3, 2017, 2:56 a.m. UTC | #1 
error is irrelevant .  but will resend a patch to correct commit message
this patch just suppresses one error message under virtualization environment, not functionality change.
and below error already happen in previous testing and has a bug tracking that. 

-----Original Message-----
From: Patchwork [mailto:patchwork@emeril.freedesktop.org] 

Sent: Thursday, March 02, 2017 10:24 PM
To: Niu, Bing <bing.niu@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for drm/i915: suppress automic commit error message under gvt-g env

== Series Details ==

Series: drm/i915: suppress automic commit error message under gvt-g env
URL   : https://patchwork.freedesktop.org/series/20558/
State : failure

== Summary ==

Series 20558v1 drm/i915: suppress automic commit error message under gvt-g env https://patchwork.freedesktop.org/api/1.0/series/20558/revisions/1/mbox/

Test gem_exec_parallel:
        Subgroup basic:
                pass       -> DMESG-WARN (fi-skl-6700hq)
Test kms_flip:
        Subgroup basic-flip-vs-wf_vblank:
                fail       -> PASS       (fi-skl-6700hq) fdo#99739
Test kms_pipe_crc_basic:
        Subgroup hang-read-crc-pipe-a:
                pass       -> INCOMPLETE (fi-bxt-t5700)

fdo#99739 https://bugs.freedesktop.org/show_bug.cgi?id=99739

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11 
fi-bsw-n3050     total:278  pass:239  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19 
fi-bxt-t5700     total:220  pass:202  dwarn:0   dfail:0   fail:0   skip:17 
fi-byt-j1900     total:278  pass:251  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:278  pass:247  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16 
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16 
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50 
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18 
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18 
fi-kbl-7500u     total:278  pass:259  dwarn:1   dfail:0   fail:0   skip:18 
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10 
fi-skl-6700hq    total:278  pass:260  dwarn:1   dfail:0   fail:0   skip:17 
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18 
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10 
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28 
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29 

de1ba88fe7549a65913589682a70b4f8a40dd726 drm-tip: 2017y-03m-02d-12h-46m-44s UTC integration manifest
18cfe85 drm/i915: suppress automic commit error message under gvt-g env

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4035/
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index b16a295..5ce1ec6 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -158,6 +158,7 @@  void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work
 	int scanline_end = intel_get_crtc_scanline(crtc);
 	u32 end_vbl_count = intel_crtc_get_vblank_counter(crtc);
 	ktime_t end_vbl_time = ktime_get();
+	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 
 	if (work) {
 		work->flip_queued_vblank = end_vbl_count;
@@ -184,7 +185,7 @@  void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work
 	local_irq_enable();
 
 	if (crtc->debug.start_vbl_count &&
-	    crtc->debug.start_vbl_count != end_vbl_count) {
+	    crtc->debug.start_vbl_count != end_vbl_count && !intel_vgpu_active(dev_priv)) {
 		DRM_ERROR("Atomic update failure on pipe %c (start=%u end=%u) time %lld us, min %d, max %d, scanline start %d, end %d\n",
 			  pipe_name(pipe), crtc->debug.start_vbl_count,
 			  end_vbl_count,