Skip to contentSkip to conversation

drm/i915/selftest: Fix dma_buf_vmap error handling

PATCH In review Mika Kuoppala 3 participants 4 messages May 17, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/selftest: Fix dma_buf_vmap error handling

The dma_buf_vmap in itself warns on error and then downgrades the return value from error ptr to NULL. Don't try to decode error value from the return in our test.

---
 drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c +3 -3
index d15cc9d3a5cd..89dc25a5a53b 100644
@@ -246,9 +246,9 @@ static int igt_dmabuf_export_vmap(void *arg)
 	i915_gem_object_put(obj);
 
 	ptr = dma_buf_vmap(dmabuf);
-	if (IS_ERR(ptr)) {
-		err = PTR_ERR(ptr);
-		pr_err("dma_buf_vmap failed with err=%d\n", err);
+	if (!ptr) {
+		pr_err("dma_buf_vmap failed\n");
+		err = -ENOMEM;
 		goto out;
 	}
 
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 4 lines · Mika Kuoppala

The dma_buf_vmap in itself warns on error and then downgrades the return value from error ptr to NULL. Don't try to decode error value from the return in our test.

Actually dma_buf_vmap shouldn't be WARNing here, so go fix that instead. -Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 8 lines · Chris Wilson
Quoted 4 lines · Mika Kuoppala

The dma_buf_vmap in itself warns on error and then downgrades the return value from error ptr to NULL. Don't try to decode error value from the return in our test.

Actually dma_buf_vmap shouldn't be WARNing here, so go fix that instead.

Regarless of warn, we have mixed use of null and errptr checks in the test. So eventually it might be best to return errptr from dma_buf_vmap along of fixing the WARN.

But as discussed in irc, this might not bring much value. -Mika
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

✓ Fi.CI.BAT: success for drm/i915/selftest: Fix dma_buf_vmap error handling

In reply to Mika Kuoppala
== Series Details ==

== Series Details ==

Series: drm/i915/selftest: Fix dma_buf_vmap error handling
URL : https://patchwork.freedesktop.org/series/24561/
State : success

== Summary ==

Series 24561v1 drm/i915/selftest: Fix dma_buf_vmap error handling
https://patchwork.freedesktop.org/api/1.0/series/24561/revisions/1/mbox/

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:445s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:592s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:510s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:491s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:484s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:420s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:415s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time:424s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:498s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:458s
fi-kbl-7500u     total:278  pass:255  dwarn:5   dfail:0   fail:0   skip:18  time:465s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:457s
fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17  time:570s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:471s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:497s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:440s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:535s
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29  time:404s

fi-bdw-gvtdvm failed to connect after reboot

2a803862b93e594c668bd2c48b9d84e5c9dd6607 drm-tip: 2017y-05m-17d-12h-46m-57s UTC integration manifest fbc7a75 drm/i915/selftest: Fix dma_buf_vmap error handling

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4723/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx