drm/i915: i915_pages_create_for_stolen should return err ptr
Subsystems (2)
PATCH 1/1 drm/i915: i915_pages_create_for_stolen should return err ptr
When gathering the pages from our backing storage we expect get_pages() to either give us our sg_table or an err ptr. However when gathering our fake pages for stolen memory we may return NULL in the event of a failure. To prevent any funny business we should therefore return the proper err ptr value.
--- drivers/gpu/drm/i915/i915_gem_stolen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_stolen.c +2 -2
@@ -525,11 +525,11 @@ i915_pages_create_for_stolen(struct drm_device *dev, st =kmalloc (sizeof (*st),GFP_KERNEL );if (st ==NULL ) -return NULL ; +return ERR_PTR (-ENOMEM );if (sg_alloc_table (st,1 ,GFP_KERNEL )) {kfree (st); -return NULL ; +return ERR_PTR (-ENOMEM ); } sg = st->sgl;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Matthew Auld
When gathering the pages from our backing storage we expect
get_pages()to either give us oursg_tableor an err ptr. However when gathering our fake pages for stolen memory we may return NULL in the event of a failure. To prevent any funny business we should therefore return the proper err ptr value.Fixes 03ac84f1830e ("drm/i915: Pass around sg_table to get_pages/put_pages backend")Cc Chris Wilson <[email protected]>Signed-off-by Matthew Auld <[email protected]>
Please have a look at https://patchwork.freedesktop.org/series/15267/
-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
Quoted 11 lines · Chris Wilson
Quoted 9 lines · Matthew Auld
When gathering the pages from our backing storage we expect
get_pages()to either give us oursg_tableor an err ptr. However when gathering our fake pages for stolen memory we may return NULL in the event of a failure. To prevent any funny business we should therefore return the proper err ptr value.Fixes 03ac84f1830e ("drm/i915: Pass around sg_table to get_pages/put_pages backend")Cc Chris Wilson <[email protected]>Signed-off-by Matthew Auld <[email protected]>Reviewed-by Chris Wilson <[email protected]>
And pushed, thanks for the patch.
-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
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: i915_pages_create_for_stolen should return err ptr
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: drm/i915: i915_pages_create_for_stolen should return err ptr
URL : https://patchwork.freedesktop.org/series/15563/
State : success
== Summary ==
Series 15563v1 drm/i915: i915_pages_create_for_stolen should return err ptr
https://patchwork.freedesktop.org/api/1.0/series/15563/revisions/1/mbox/
fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 fi-skl-6770hq total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
05104adb7446f310fad4e36f22d4c84ffafa31fc drm-intel-nightly: 2016y-11m-18d-13h-10m-16s UTC integration manifest 5342ae0 drm/i915: i915_pages_create_for_stolen should return err ptr
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3059/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx