drm/i915: suppress atomic commit error message under gvt-g env
Subsystems (2)
PATCH v2 1/1 drm/i915: suppress atomic commit error message under gvt-g env
From: Bing Niu <[email protected]>
under virtualization enviroment, it is possible guest update pipe registers across vblank intervals due to overhead of mmio traps or vm schedule out. However, it is safe since those pipe update happen in virual registers and will not be committed to hardware. suppress that atomic commit error message under virtualization case to avoid confusing user.
v2: per ville's comment: return early and against Maarten's patch
--- drivers/gpu/drm/i915/intel_sprite.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_sprite.c +4 -0
@@ -161,6 +161,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *workint 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;
@@ -186,6 +187,9 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *worklocal_irq_enable (); +if (intel_vgpu_active (dev_priv)) +return ; +if (crtc->debug.start_vbl_count && crtc->debug.start_vbl_count != end_vbl_count) { 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",
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: suppress atomic commit error message under gvt-g env (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915: suppress atomic commit error message under gvt-g env (rev2)
URL : https://patchwork.freedesktop.org/series/20600/
State : success
== Summary ==
Series 20600v2 drm/i915: suppress atomic commit error message under gvt-g env
https://patchwork.freedesktop.org/api/1.0/series/20600/revisions/2/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 476s fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 610s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 530s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 613s fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 503s fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 498s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 447s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 436s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 448s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 493s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 498s fi-kbl-7500u total:278 pass:259 dwarn:1 dfail:0 fail:0 skip:18 time: 476s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 506s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 602s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 501s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 550s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 553s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time: 422s
bf077370616c6c41acd0ab6d46158569244941a8 drm-tip: 2017y-03m-07d-07h-57m-10s UTC integration manifest fdc7f26 drm/i915: suppress atomic commit error message under gvt-g env
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4079/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 29 lines · On Tue, Mar 07, 2017 at 12:46:35PM -0500, [email protected] wrote:
From: Bing Niu <[email protected]>
under virtualization enviroment, it is possible guest update pipe registers across vblank intervals due to overhead of mmio traps or vm schedule out. However, it is safe since those pipe update happen in virual registers and will not be committed to hardware. suppress that atomic commit error message under virtualization case to avoid confusing user.
v2: per ville's comment: return early and against Maarten's patch
Signed-off-by Bing Niu <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/intel_sprite.c +1
-0@@ -161,6 +161,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *workint 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;
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work · line 190
Quoted 4 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-0@@ -186,6 +187,9 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *worklocal_irq_enable (); +if (intel_vgpu_active (dev_priv))
^
missing space
I don't understand why it's OK fail atomicity guarantees for vgpu, but I don't really care either. So I'm fine with this.
Quoted 7 lines
drivers/gpu/drm/i915/intel_sprite.c +2
-0+return ; +if (crtc->debug.start_vbl_count && crtc->debug.start_vbl_count != end_vbl_count) { 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",Signature · 1 line
2.7.4
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Niu, Bing
Acked-by Ville SyrjäläHi ville:
thanks for acked-by and will fix that missing space :)
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Wednesday, March 08, 2017 12:13 AM
To: Niu, Bing <[email protected]>
Cc: [email protected]; Lv, Zhiyuan <[email protected]>; Wang, Zhi A <[email protected]>
Subject: Re: [Intel-gfx][PATCH v2] drm/i915: suppress atomic commit error message under gvt-g env
Quoted 32 lines · On Tue, Mar 07, 2017 at 12:46:35PM -0500, [email protected] wrote:
From: Bing Niu <[email protected]>
under virtualization enviroment, it is possible guest update pipe registers across vblank intervals due to overhead of mmio traps or vm schedule out. However, it is safe since those pipe update happen in virual registers and will not be committed to hardware. suppress that atomic commit error message under virtualization case to avoid confusing user.
v2: per ville's comment: return early and against Maarten's patch
Signed-off-by Bing Niu <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/intel_sprite.c +1
-0@@ -161,6 +161,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *workint 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; @@ -186,6 +187,9 @@ voidintel_pipe_update_end(struct
intel_crtc*crtc, structintel_flip_work*work
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work · line 190
Quoted 3 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-0local_irq_enable (); +if (intel_vgpu_active (dev_priv))
^
missing space
I don't understand why it's OK fail atomicity guarantees for vgpu, but I don't really care either. So I'm fine with this.
Quoted 8 lines
drivers/gpu/drm/i915/intel_sprite.c +2
-0+return ; +if (crtc->debug.start_vbl_count && crtc->debug.start_vbl_count != end_vbl_count) { 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", --
2.7.4
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx