* [PATCH] drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path
@ 2018-03-05 10:33 Chris Wilson
2018-03-05 11:12 ` Ville Syrjälä
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chris Wilson @ 2018-03-05 10:33 UTC (permalink / raw)
To: intel-gfx
If we fail to acquire a fence when we must, we must unwind before
reporting the error. Otherwise, we lose tracking of the vma pinning and
eventually hit a bug like
<3>[ 46.163202] i915_vma_unpin:333 GEM_BUG_ON(!i915_vma_is_pinned(vma))
<4>[ 46.163424] ------------[ cut here ]------------
<2>[ 46.163429] kernel BUG at drivers/gpu/drm/i915/i915_vma.h:333!
<4>[ 46.163444] invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI
<0>[ 46.163451] Dumping ftrace buffer:
<0>[ 46.163457] ---------------------------------
<0>[ 46.163630] <...>-84 1.... 46260767us : i915_gem_object_unpin_from_display_plane: i915_vma_unpin:333 GEM_BUG_ON(!i915_vma_is_pinned(vma))
<0>[ 46.163635] ---------------------------------
<4>[ 46.163638] Modules linked in: vgem i915 snd_hda_codec_analog snd_hda_codec_generic coretemp snd_hda_intel snd_hda_codec snd_hwdep snd_hda_core snd_pcm lpc_ich mei_me e1000e mei prime_numbers
<4>[ 46.163667] CPU: 1 PID: 84 Comm: kworker/u16:1 Tainted: G U 4.16.0-rc3-gc07ef2c77d14-kasan_18+ #1
<4>[ 46.163671] Hardware name: Dell Inc. OptiPlex 755 /0PU052, BIOS A08 02/19/2008
<4>[ 46.163743] Workqueue: events_unbound intel_atomic_commit_work [i915]
<4>[ 46.163809] RIP: 0010:i915_gem_object_unpin_from_display_plane+0x253/0x2f0 [i915]
<4>[ 46.163813] RSP: 0018:ffff8800624cfb48 EFLAGS: 00010286
<4>[ 46.163818] RAX: 000000000000000c RBX: ffff880064446c40 RCX: ffff8800653135b8
<4>[ 46.163822] RDX: dffffc0000000000 RSI: 0000000000000054 RDI: ffff8800651e30d0
<4>[ 46.163825] RBP: 00000000000003d0 R08: 0000000000000001 R09: ffff8800651e3158
<4>[ 46.163829] R10: 0000000000000000 R11: ffff8800651e30f0 R12: 0000000000000001
<4>[ 46.163832] R13: ffff880054c58620 R14: 0000000000000000 R15: dffffc0000000000
<4>[ 46.163836] FS: 0000000000000000(0000) GS:ffff880066040000(0000) knlGS:0000000000000000
<4>[ 46.163840] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
<4>[ 46.163843] CR2: 00007f1fc6fb0000 CR3: 00000000526fe000 CR4: 00000000000006e0
<4>[ 46.163846] Call Trace:
<4>[ 46.163918] intel_unpin_fb_vma+0xbd/0x300 [i915]
<4>[ 46.163990] intel_cleanup_plane_fb+0x99/0xc0 [i915]
<4>[ 46.163998] drm_atomic_helper_cleanup_planes+0x166/0x280
<4>[ 46.164071] intel_atomic_commit_tail+0x1594/0x33a0 [i915]
<4>[ 46.164081] ? process_one_work+0x66e/0x1460
<4>[ 46.164151] ? skl_update_crtcs+0x9c0/0x9c0 [i915]
<4>[ 46.164157] ? lock_acquire+0x13d/0x390
<4>[ 46.164161] ? lock_acquire+0x13d/0x390
<4>[ 46.164169] process_one_work+0x71a/0x1460
<4>[ 46.164175] ? __schedule+0x838/0x1e50
<4>[ 46.164182] ? pwq_dec_nr_in_flight+0x2b0/0x2b0
<4>[ 46.164188] ? _raw_spin_lock_irq+0xa/0x40
<4>[ 46.164194] worker_thread+0xdf/0xf60
<4>[ 46.164204] ? process_one_work+0x1460/0x1460
<4>[ 46.164209] kthread+0x2cf/0x3c0
<4>[ 46.164213] ? _kthread_create_on_node+0xa0/0xa0
<4>[ 46.164218] ret_from_fork+0x3a/0x50
<4>[ 46.164227] Code: e8 78 d9 cd e8 48 8b 35 cc 9e 47 00 49 c7 c0 c0 31 84 c0 b9 4d 01 00 00 48 c7 c2 e0 80 84 c0 48 c7 c7 0e bb 57 c0 e8 5d 4b df e8 <0f> 0b 48 c7 c1 c0 30 84 c0 ba 4e 01 00 00 48 c7 c6 e0 80 84 c0
<1>[ 46.164368] RIP: i915_gem_object_unpin_from_display_plane+0x253/0x2f0 [i915] RSP: ffff8800624cfb48
Fixes: 85798ac9b35f ("drm/i915: Fail if we can't get a fence for gen2/3 tiled scanout")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 90f0fc8cc2bd..ceed0821b37d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2152,6 +2152,7 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
*/
ret = i915_vma_pin_fence(vma);
if (ret != 0 && INTEL_GEN(dev_priv) < 4) {
+ i915_gem_object_unpin_from_display_plane(vma);
vma = ERR_PTR(ret);
goto err;
}
--
2.16.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path
2018-03-05 10:33 [PATCH] drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path Chris Wilson
@ 2018-03-05 11:12 ` Ville Syrjälä
2018-03-05 12:16 ` Chris Wilson
2018-03-05 11:49 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-03-05 15:13 ` ✓ Fi.CI.IGT: " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Ville Syrjälä @ 2018-03-05 11:12 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Mon, Mar 05, 2018 at 10:33:12AM +0000, Chris Wilson wrote:
> If we fail to acquire a fence when we must, we must unwind before
> reporting the error. Otherwise, we lose tracking of the vma pinning and
> eventually hit a bug like
>
> <3>[ 46.163202] i915_vma_unpin:333 GEM_BUG_ON(!i915_vma_is_pinned(vma))
> <4>[ 46.163424] ------------[ cut here ]------------
> <2>[ 46.163429] kernel BUG at drivers/gpu/drm/i915/i915_vma.h:333!
> <4>[ 46.163444] invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI
> <0>[ 46.163451] Dumping ftrace buffer:
> <0>[ 46.163457] ---------------------------------
> <0>[ 46.163630] <...>-84 1.... 46260767us : i915_gem_object_unpin_from_display_plane: i915_vma_unpin:333 GEM_BUG_ON(!i915_vma_is_pinned(vma))
> <0>[ 46.163635] ---------------------------------
> <4>[ 46.163638] Modules linked in: vgem i915 snd_hda_codec_analog snd_hda_codec_generic coretemp snd_hda_intel snd_hda_codec snd_hwdep snd_hda_core snd_pcm lpc_ich mei_me e1000e mei prime_numbers
> <4>[ 46.163667] CPU: 1 PID: 84 Comm: kworker/u16:1 Tainted: G U 4.16.0-rc3-gc07ef2c77d14-kasan_18+ #1
> <4>[ 46.163671] Hardware name: Dell Inc. OptiPlex 755 /0PU052, BIOS A08 02/19/2008
> <4>[ 46.163743] Workqueue: events_unbound intel_atomic_commit_work [i915]
> <4>[ 46.163809] RIP: 0010:i915_gem_object_unpin_from_display_plane+0x253/0x2f0 [i915]
> <4>[ 46.163813] RSP: 0018:ffff8800624cfb48 EFLAGS: 00010286
> <4>[ 46.163818] RAX: 000000000000000c RBX: ffff880064446c40 RCX: ffff8800653135b8
> <4>[ 46.163822] RDX: dffffc0000000000 RSI: 0000000000000054 RDI: ffff8800651e30d0
> <4>[ 46.163825] RBP: 00000000000003d0 R08: 0000000000000001 R09: ffff8800651e3158
> <4>[ 46.163829] R10: 0000000000000000 R11: ffff8800651e30f0 R12: 0000000000000001
> <4>[ 46.163832] R13: ffff880054c58620 R14: 0000000000000000 R15: dffffc0000000000
> <4>[ 46.163836] FS: 0000000000000000(0000) GS:ffff880066040000(0000) knlGS:0000000000000000
> <4>[ 46.163840] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> <4>[ 46.163843] CR2: 00007f1fc6fb0000 CR3: 00000000526fe000 CR4: 00000000000006e0
> <4>[ 46.163846] Call Trace:
> <4>[ 46.163918] intel_unpin_fb_vma+0xbd/0x300 [i915]
> <4>[ 46.163990] intel_cleanup_plane_fb+0x99/0xc0 [i915]
> <4>[ 46.163998] drm_atomic_helper_cleanup_planes+0x166/0x280
> <4>[ 46.164071] intel_atomic_commit_tail+0x1594/0x33a0 [i915]
> <4>[ 46.164081] ? process_one_work+0x66e/0x1460
> <4>[ 46.164151] ? skl_update_crtcs+0x9c0/0x9c0 [i915]
> <4>[ 46.164157] ? lock_acquire+0x13d/0x390
> <4>[ 46.164161] ? lock_acquire+0x13d/0x390
> <4>[ 46.164169] process_one_work+0x71a/0x1460
> <4>[ 46.164175] ? __schedule+0x838/0x1e50
> <4>[ 46.164182] ? pwq_dec_nr_in_flight+0x2b0/0x2b0
> <4>[ 46.164188] ? _raw_spin_lock_irq+0xa/0x40
> <4>[ 46.164194] worker_thread+0xdf/0xf60
> <4>[ 46.164204] ? process_one_work+0x1460/0x1460
> <4>[ 46.164209] kthread+0x2cf/0x3c0
> <4>[ 46.164213] ? _kthread_create_on_node+0xa0/0xa0
> <4>[ 46.164218] ret_from_fork+0x3a/0x50
> <4>[ 46.164227] Code: e8 78 d9 cd e8 48 8b 35 cc 9e 47 00 49 c7 c0 c0 31 84 c0 b9 4d 01 00 00 48 c7 c2 e0 80 84 c0 48 c7 c7 0e bb 57 c0 e8 5d 4b df e8 <0f> 0b 48 c7 c1 c0 30 84 c0 ba 4e 01 00 00 48 c7 c6 e0 80 84 c0
> <1>[ 46.164368] RIP: i915_gem_object_unpin_from_display_plane+0x253/0x2f0 [i915] RSP: ffff8800624cfb48
>
> Fixes: 85798ac9b35f ("drm/i915: Fail if we can't get a fence for gen2/3 tiled scanout")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 90f0fc8cc2bd..ceed0821b37d 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2152,6 +2152,7 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
> */
> ret = i915_vma_pin_fence(vma);
> if (ret != 0 && INTEL_GEN(dev_priv) < 4) {
> + i915_gem_object_unpin_from_display_plane(vma);
Doh!
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> vma = ERR_PTR(ret);
> goto err;
> }
> --
> 2.16.2
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path
2018-03-05 10:33 [PATCH] drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path Chris Wilson
2018-03-05 11:12 ` Ville Syrjälä
@ 2018-03-05 11:49 ` Patchwork
2018-03-05 15:13 ` ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-03-05 11:49 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path
URL : https://patchwork.freedesktop.org/series/39367/
State : success
== Summary ==
Series 39367v1 drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path
https://patchwork.freedesktop.org/api/1.0/series/39367/revisions/1/mbox/
---- Known issues:
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-cnl-y3) fdo#103191
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:413s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:421s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:370s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:483s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:278s
fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:476s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:477s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:471s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:454s
fi-cfl-8700k total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:392s
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:557s
fi-cnl-y3 total:288 pass:261 dwarn:1 dfail:0 fail:0 skip:26 time:571s
fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:420s
fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:289s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:506s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:385s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:410s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:454s
fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:415s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:451s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:491s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:448s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:492s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:588s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:422s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:501s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:519s
fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:487s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:477s
fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:404s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:428s
fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:521s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:390s
fi-cfl-u failed to collect. IGT log at Patchwork_8227/fi-cfl-u/run0.log
2501aa775c7abc194aa2fbf93475cd1898aaa710 drm-tip: 2018y-03m-05d-10h-55m-37s UTC integration manifest
f2a0cd551a94 drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8227/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path
2018-03-05 11:12 ` Ville Syrjälä
@ 2018-03-05 12:16 ` Chris Wilson
0 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2018-03-05 12:16 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
Quoting Ville Syrjälä (2018-03-05 11:12:12)
> On Mon, Mar 05, 2018 at 10:33:12AM +0000, Chris Wilson wrote:
> > If we fail to acquire a fence when we must, we must unwind before
> > reporting the error. Otherwise, we lose tracking of the vma pinning and
> > eventually hit a bug like
> >
> > <3>[ 46.163202] i915_vma_unpin:333 GEM_BUG_ON(!i915_vma_is_pinned(vma))
> > <4>[ 46.163424] ------------[ cut here ]------------
> > <2>[ 46.163429] kernel BUG at drivers/gpu/drm/i915/i915_vma.h:333!
> > <4>[ 46.163444] invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI
> > <0>[ 46.163451] Dumping ftrace buffer:
> > <0>[ 46.163457] ---------------------------------
> > <0>[ 46.163630] <...>-84 1.... 46260767us : i915_gem_object_unpin_from_display_plane: i915_vma_unpin:333 GEM_BUG_ON(!i915_vma_is_pinned(vma))
> > <0>[ 46.163635] ---------------------------------
> > <4>[ 46.163638] Modules linked in: vgem i915 snd_hda_codec_analog snd_hda_codec_generic coretemp snd_hda_intel snd_hda_codec snd_hwdep snd_hda_core snd_pcm lpc_ich mei_me e1000e mei prime_numbers
> > <4>[ 46.163667] CPU: 1 PID: 84 Comm: kworker/u16:1 Tainted: G U 4.16.0-rc3-gc07ef2c77d14-kasan_18+ #1
> > <4>[ 46.163671] Hardware name: Dell Inc. OptiPlex 755 /0PU052, BIOS A08 02/19/2008
> > <4>[ 46.163743] Workqueue: events_unbound intel_atomic_commit_work [i915]
> > <4>[ 46.163809] RIP: 0010:i915_gem_object_unpin_from_display_plane+0x253/0x2f0 [i915]
> > <4>[ 46.163813] RSP: 0018:ffff8800624cfb48 EFLAGS: 00010286
> > <4>[ 46.163818] RAX: 000000000000000c RBX: ffff880064446c40 RCX: ffff8800653135b8
> > <4>[ 46.163822] RDX: dffffc0000000000 RSI: 0000000000000054 RDI: ffff8800651e30d0
> > <4>[ 46.163825] RBP: 00000000000003d0 R08: 0000000000000001 R09: ffff8800651e3158
> > <4>[ 46.163829] R10: 0000000000000000 R11: ffff8800651e30f0 R12: 0000000000000001
> > <4>[ 46.163832] R13: ffff880054c58620 R14: 0000000000000000 R15: dffffc0000000000
> > <4>[ 46.163836] FS: 0000000000000000(0000) GS:ffff880066040000(0000) knlGS:0000000000000000
> > <4>[ 46.163840] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> > <4>[ 46.163843] CR2: 00007f1fc6fb0000 CR3: 00000000526fe000 CR4: 00000000000006e0
> > <4>[ 46.163846] Call Trace:
> > <4>[ 46.163918] intel_unpin_fb_vma+0xbd/0x300 [i915]
> > <4>[ 46.163990] intel_cleanup_plane_fb+0x99/0xc0 [i915]
> > <4>[ 46.163998] drm_atomic_helper_cleanup_planes+0x166/0x280
> > <4>[ 46.164071] intel_atomic_commit_tail+0x1594/0x33a0 [i915]
> > <4>[ 46.164081] ? process_one_work+0x66e/0x1460
> > <4>[ 46.164151] ? skl_update_crtcs+0x9c0/0x9c0 [i915]
> > <4>[ 46.164157] ? lock_acquire+0x13d/0x390
> > <4>[ 46.164161] ? lock_acquire+0x13d/0x390
> > <4>[ 46.164169] process_one_work+0x71a/0x1460
> > <4>[ 46.164175] ? __schedule+0x838/0x1e50
> > <4>[ 46.164182] ? pwq_dec_nr_in_flight+0x2b0/0x2b0
> > <4>[ 46.164188] ? _raw_spin_lock_irq+0xa/0x40
> > <4>[ 46.164194] worker_thread+0xdf/0xf60
> > <4>[ 46.164204] ? process_one_work+0x1460/0x1460
> > <4>[ 46.164209] kthread+0x2cf/0x3c0
> > <4>[ 46.164213] ? _kthread_create_on_node+0xa0/0xa0
> > <4>[ 46.164218] ret_from_fork+0x3a/0x50
> > <4>[ 46.164227] Code: e8 78 d9 cd e8 48 8b 35 cc 9e 47 00 49 c7 c0 c0 31 84 c0 b9 4d 01 00 00 48 c7 c2 e0 80 84 c0 48 c7 c7 0e bb 57 c0 e8 5d 4b df e8 <0f> 0b 48 c7 c1 c0 30 84 c0 ba 4e 01 00 00 48 c7 c6 e0 80 84 c0
> > <1>[ 46.164368] RIP: i915_gem_object_unpin_from_display_plane+0x253/0x2f0 [i915] RSP: ffff8800624cfb48
> >
> > Fixes: 85798ac9b35f ("drm/i915: Fail if we can't get a fence for gen2/3 tiled scanout")
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_display.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 90f0fc8cc2bd..ceed0821b37d 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -2152,6 +2152,7 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
> > */
> > ret = i915_vma_pin_fence(vma);
> > if (ret != 0 && INTEL_GEN(dev_priv) < 4) {
> > + i915_gem_object_unpin_from_display_plane(vma);
>
> Doh!
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
And pushed. BAT is all the coverage we get until kasan runs.
Thanks,
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path
2018-03-05 10:33 [PATCH] drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path Chris Wilson
2018-03-05 11:12 ` Ville Syrjälä
2018-03-05 11:49 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-03-05 15:13 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-03-05 15:13 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path
URL : https://patchwork.freedesktop.org/series/39367/
State : success
== Summary ==
---- Known issues:
Test kms_chv_cursor_fail:
Subgroup pipe-b-256x256-left-edge:
dmesg-warn -> PASS (shard-snb) fdo#105185 +1
Test kms_frontbuffer_tracking:
Subgroup basic:
fail -> PASS (shard-apl) fdo#103167
Test kms_sysfs_edid_timing:
pass -> WARN (shard-apl) fdo#100047
Test perf:
Subgroup polling:
pass -> FAIL (shard-hsw) fdo#102252
fdo#105185 https://bugs.freedesktop.org/show_bug.cgi?id=105185
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-apl total:3452 pass:1813 dwarn:1 dfail:0 fail:7 skip:1629 time:11782s
shard-hsw total:3468 pass:1772 dwarn:1 dfail:0 fail:2 skip:1692 time:11698s
shard-snb total:3468 pass:1365 dwarn:1 dfail:0 fail:1 skip:2101 time:7106s
Blacklisted hosts:
shard-kbl total:3371 pass:1899 dwarn:1 dfail:0 fail:7 skip:1462 time:8660s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8227/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-05 15:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-05 10:33 [PATCH] drm/i915: Unwind vma pinning for intel_pin_and_fence_fb_obj error path Chris Wilson
2018-03-05 11:12 ` Ville Syrjälä
2018-03-05 12:16 ` Chris Wilson
2018-03-05 11:49 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-03-05 15:13 ` ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.