drm/i915: Propagate error from drm_gem_object_init()
Subsystems (2)
PATCH 1/1 drm/i915: Propagate error from drm_gem_object_init()
From: Chris Wilson <[email protected]>
Propagate the real error from drm_gem_object_init(). Note this also fixes some confusion in the error return from i915_gem_alloc_object...
v2:
(Matthew Auld)
- updated new users of gem_alloc_object from latest drm-nightly
- replaced occurrences of IS_ERR_OR_NULL() with IS_ERR()
v3:
(Joonas Lahtinen)
- fix double "From:" in commit message
- add goto teardown path
--- drivers/gpu/drm/i915/i915_gem.c | 21 +++++++++++++-------- drivers/gpu/drm/i915/i915_gem_batch_pool.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_context.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_render_state.c | 7 +++++-- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_fbdev.c | 4 ++-- drivers/gpu/drm/i915/intel_lrc.c | 10 ++++++---- drivers/gpu/drm/i915/intel_overlay.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 19 ++++++++++--------- 10 files changed, 44 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +13 -8
@@ -382,8 +382,8 @@ i915_gem_create(struct drm_file *file,/* Allocate the new object */ obj =i915_gem_alloc_object (dev, size); -if (obj ==NULL ) -return -ENOMEM ; +if (IS_ERR (obj)) +return PTR_ERR (obj); ret =drm_gem_handle_create (file, &obj->base, &handle);/* drop reference from allocate - handle holds it now */
@@ -4498,15 +4498,15 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,struct drm_i915_gem_object *obj;struct address_space *mapping;gfp_t mask; +int ret; obj =i915_gem_object_alloc (dev);if (obj ==NULL ) -return NULL ; +return ERR_PTR (-ENOMEM ); -if (drm_gem_object_init (dev, &obj->base, size) !=0 ) { -i915_gem_object_free (obj); -return NULL ; - } + ret =drm_gem_object_init (dev, &obj->base, size); +if (ret) + goto fail; mask =GFP_HIGHUSER | __GFP_RECLAIMABLE;if (IS_CRESTLINE (dev) ||IS_BROADWATER (dev)) {
@@ -4543,6 +4543,11 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,trace_i915_gem_object_create (obj);return obj; + +fail: +i915_gem_object_free (obj); + +return ERR_PTR (ret); }static bool discard_backing_storage (struct drm_i915_gem_object *obj)
@@ -5362,7 +5367,7 @@ i915_gem_object_create_from_data(struct drm_device *dev,int ret; obj =i915_gem_alloc_object (dev,round_up (size,PAGE_SIZE )); -if (IS_ERR_OR_NULL (obj)) +if (IS_ERR (obj))return obj; ret =i915_gem_object_set_to_cpu_domain (obj, true);
drivers/gpu/drm/i915/i915_gem_batch_pool.c +2 -2
@@ -135,8 +135,8 @@ i915_gem_batch_pool_get(struct i915_gem_batch_pool *pool,int ret; obj =i915_gem_alloc_object (pool->dev, size); -if (obj ==NULL ) -return ERR_PTR (-ENOMEM ); +if (IS_ERR (obj)) +return obj; ret =i915_gem_object_get_pages (obj);if (ret)
drivers/gpu/drm/i915/i915_gem_context.c +2 -2
@@ -179,8 +179,8 @@ i915_gem_alloc_context_obj(struct drm_device *dev, size_t size)int ret; obj =i915_gem_alloc_object (dev, size); -if (obj ==NULL ) -return ERR_PTR (-ENOMEM ); +if (IS_ERR (obj)) +return obj;/* * Try to make the context utilize L3 as well as LLC.
drivers/gpu/drm/i915/i915_gem_render_state.c +5 -2
@@ -58,8 +58,11 @@ static int render_state_init(struct render_state *so, struct drm_device *dev)return -EINVAL ; so->obj =i915_gem_alloc_object (dev,4096 ); -if (so->obj ==NULL ) -return -ENOMEM ; +if (IS_ERR (so->obj)) { + ret =PTR_ERR (so->obj); + so->obj =NULL ; +return ret; + } ret =i915_gem_obj_ggtt_pin (so->obj,4096 ,0 );if (ret)
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
@@ -588,7 +588,7 @@ static struct drm_i915_gem_object *gem_allocate_guc_obj(struct drm_device *dev,struct drm_i915_gem_object *obj; obj =i915_gem_alloc_object (dev, size); -if (!obj) +if (IS_ERR (obj))return NULL ;if (i915_gem_object_get_pages (obj)) {
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -10320,8 +10320,8 @@ intel_framebuffer_create_for_mode(struct drm_device *dev, obj =i915_gem_alloc_object (dev,intel_framebuffer_size_for_mode (mode, bpp)); -if (obj ==NULL ) -return ERR_PTR (-ENOMEM ); +if (IS_ERR (obj)) +return ERR_CAST (obj); mode_cmd.width = mode->hdisplay; mode_cmd.height = mode->vdisplay;
drivers/gpu/drm/i915/intel_fbdev.c +2 -2
@@ -151,9 +151,9 @@ static int intelfb_alloc(struct drm_fb_helper *helper, obj =i915_gem_object_create_stolen (dev, size);if (obj ==NULL ) obj =i915_gem_alloc_object (dev, size); -if (!obj) { +if (IS_ERR (obj)) {DRM_ERROR ("failed to allocate framebuffer\n" ); - ret = -ENOMEM ; + ret =PTR_ERR (obj); goto out; }
drivers/gpu/drm/i915/intel_lrc.c +6 -4
@@ -1474,9 +1474,11 @@ static int lrc_setup_wa_ctx_obj(struct intel_engine_cs *engine, u32 size) engine->wa_ctx.obj =i915_gem_alloc_object (engine->dev,PAGE_ALIGN (size)); -if (!engine->wa_ctx.obj) { +if (IS_ERR (engine->wa_ctx.obj)) {DRM_DEBUG_DRIVER ("alloc LRC WA ctx backing obj failed.\n" ); -return -ENOMEM ; + ret =PTR_ERR (engine->wa_ctx.obj); + engine->wa_ctx.obj =NULL ; +return ret; } ret =i915_gem_obj_ggtt_pin (engine->wa_ctx.obj,PAGE_SIZE ,0 );
@@ -2666,9 +2668,9 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx, context_size +=PAGE_SIZE *LRC_PPHWSP_PN ; ctx_obj =i915_gem_alloc_object (dev, context_size); -if (!ctx_obj) { +if (IS_ERR (ctx_obj)) {DRM_DEBUG_DRIVER ("Alloc LRC backing obj failed.\n" ); -return -ENOMEM ; +return PTR_ERR (ctx_obj); } ringbuf =intel_engine_create_ringbuffer (engine,4 *PAGE_SIZE );
drivers/gpu/drm/i915/intel_overlay.c +1 -1
@@ -1397,7 +1397,7 @@ void intel_setup_overlay(struct drm_device *dev) reg_bo =i915_gem_object_create_stolen (dev,PAGE_SIZE );if (reg_bo ==NULL ) reg_bo =i915_gem_alloc_object (dev,PAGE_SIZE ); -if (reg_bo ==NULL ) +if (IS_ERR (reg_bo)) goto out_free; overlay->reg_bo = reg_bo;
drivers/gpu/drm/i915/intel_ringbuffer.c +10 -9
@@ -672,9 +672,10 @@ intel_init_pipe_control(struct intel_engine_cs *engine)WARN_ON (engine->scratch.obj); engine->scratch.obj =i915_gem_alloc_object (engine->dev,4096 ); -if (engine->scratch.obj ==NULL ) { +if (IS_ERR (engine->scratch.obj)) {DRM_ERROR ("Failed to allocate seqno page\n" ); - ret = -ENOMEM ; + ret =PTR_ERR (engine->scratch.obj); + engine->scratch.obj =NULL ; goto err; }
@@ -2023,9 +2024,9 @@ static int init_status_page(struct intel_engine_cs *engine)int ret; obj =i915_gem_alloc_object (engine->dev,4096 ); -if (obj ==NULL ) { +if (IS_ERR (obj)) {DRM_ERROR ("Failed to allocate status page\n" ); -return -ENOMEM ; +return PTR_ERR (obj); } ret =i915_gem_object_set_cache_level (obj,I915_CACHE_LLC );
@@ -2164,8 +2165,8 @@ static int intel_alloc_ringbuffer_obj(struct drm_device *dev, obj =i915_gem_object_create_stolen (dev, ringbuf->size);if (obj ==NULL ) obj =i915_gem_alloc_object (dev, ringbuf->size); -if (obj ==NULL ) -return -ENOMEM ; +if (IS_ERR (obj)) +return PTR_ERR (obj);/* mark ring buffers as read-only from GPU side by default */ obj->gt_ro =1 ;
@@ -2777,7 +2778,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)if (INTEL_INFO (dev)->gen >=8 ) {if (i915_semaphore_is_enabled (dev)) { obj =i915_gem_alloc_object (dev,4096 ); -if (obj ==NULL ) { +if (IS_ERR (obj)) {DRM_ERROR ("Failed to allocate semaphore bo. Disabling semaphores\n" ); i915.semaphores =0 ; }else {
@@ -2886,9 +2887,9 @@ int intel_init_render_ring_buffer(struct drm_device *dev)/* Workaround batchbuffer to combat CS tlb bug. */ if (HAS_BROKEN_CS_TLB (dev)) { obj =i915_gem_alloc_object (dev,I830_WA_SIZE ); -if (obj ==NULL ) { +if (IS_ERR (obj)) {DRM_ERROR ("Failed to allocate batch bo\n" ); -return -ENOMEM ; +return PTR_ERR (obj); } ret =i915_gem_obj_ggtt_pin (obj,0 ,0 );
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 46 lines · Matthew Auld
From: Chris Wilson <[email protected]>
Propagate the real error from
drm_gem_object_init(). Note this also fixes some confusion in the error return fromi915_gem_alloc_object...v2:
(Matthew Auld)
- updated new users ofgem_alloc_objectfrom latest drm-nightly
- replaced occurrences ofIS_ERR_OR_NULL()withIS_ERR()
v3:
(Joonas Lahtinen)
- fix double "From:" in commit message
- add goto teardown pathSigned-off-by Matthew Auld <[email protected]>Signed-off-by Chris Wilson <[email protected]>Reviewed-by Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 21 +++++++++++++-------- drivers/gpu/drm/i915/i915_gem_batch_pool.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_context.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_render_state.c | 7 +++++-- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_fbdev.c | 4 ++-- drivers/gpu/drm/i915/intel_lrc.c | 10 ++++++---- drivers/gpu/drm/i915/intel_overlay.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 19 ++++++++++--------- 10 files changed, 44 insertions(+), 33 deletions(-)drivers/gpu/drm/i915/i915_gem.c +2
-2@@ -382,8 +382,8 @@ i915_gem_create(struct drm_file *file,/* Allocate the new object */ obj =i915_gem_alloc_object (dev, size); -if (obj ==NULL ) -return -ENOMEM ; +if (IS_ERR (obj)) +return PTR_ERR (obj); ret =drm_gem_handle_create (file, &obj->base, &handle);/* drop reference from allocate - handle holds it now */
drivers/gpu/drm/i915/i915_gem.c struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev, · line 4505
Quoted 9 lines
drivers/gpu/drm/i915/i915_gem.c +2
-1@@ -4498,15 +4498,15 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,struct drm_i915_gem_object *obj;struct address_space *mapping;gfp_t mask; +int ret; obj =i915_gem_object_alloc (dev);if (obj ==NULL ) -return NULL ; +return ERR_PTR (-ENOMEM );
The two changes above looked really really confusing, where one tests the returned pointer and returns it if it's an ERR_PTR, and the other tests for NULL and returns ERR_PTR(-ENOMEM).
Then I realised one was i915_gem_alloc_object() and the other was i915_gem_object_alloc()!
Can we please get rid of one or the other? Since we generally use subsystem_class_action naming, I'd suggest keeping (the low-level memory-allocator) i915_gem_object_alloc(), and renaming the high-level i915_gem_alloc_object() to i915_gem_object_create() or similar.
drivers/gpu/drm/i915/i915_gem.c struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev, · line 4543
Quoted 12 lines
drivers/gpu/drm/i915/i915_gem.c +3
-4-if (drm_gem_object_init (dev, &obj->base, size) !=0 ) { -i915_gem_object_free (obj); -return NULL ; - } + ret =drm_gem_object_init (dev, &obj->base, size); +if (ret) + goto fail; mask =GFP_HIGHUSER | __GFP_RECLAIMABLE;if (IS_CRESTLINE (dev) ||IS_BROADWATER (dev)) {@@ -4543,6 +4543,11 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,trace_i915_gem_object_create (obj);
Oh and BTW i915_gem_alloc_object() already calls itself i915_gem_object_create() in trace messages!
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerQuoted 61 lines · Dave Gordon
Quoted 47 lines · Matthew Auld
From: Chris Wilson <[email protected]>
Propagate the real error from
drm_gem_object_init(). Note this also fixes some confusion in the error return fromi915_gem_alloc_object...v2:
(Matthew Auld)
- updated new users ofgem_alloc_objectfrom latest drm-nightly
- replaced occurrences ofIS_ERR_OR_NULL()withIS_ERR()v3:
(Joonas Lahtinen)
- fix double "From:" in commit message
- add goto teardown pathSigned-off-by Matthew Auld <[email protected]>Signed-off-by Chris Wilson <[email protected]>Reviewed-by Joonas Lahtinen <[email protected]>---
drivers/gpu/drm/i915/i915_gem.c | 21 +++++++++++++-------- drivers/gpu/drm/i915/i915_gem_batch_pool.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_context.c | 4 ++--drivers/gpu/drm/i915/i915_gem_render_state.c| 7 +++++-- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_fbdev.c | 4 ++-- drivers/gpu/drm/i915/intel_lrc.c | 10 ++++++---- drivers/gpu/drm/i915/intel_overlay.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 19 ++++++++++---------10 files changed, 44 insertions(+), 33 deletions(-)drivers/gpu/drm/i915/i915_gem.c +2
-2@@ -382,8 +382,8 @@ i915_gem_create(struct drm_file *file, /* Allocate the new object */ obj = i915_gem_alloc_object(dev, size); -if (obj ==NULL ) -return -ENOMEM ; +if (IS_ERR (obj)) +return PTR_ERR (obj); ret = drm_gem_handle_create(file, &obj->base, &handle); /* drop reference from allocate - handle holds it now */drivers/gpu/drm/i915/i915_gem.c struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev, · line 4505
Quoted 9 lines
drivers/gpu/drm/i915/i915_gem.c +2
-1@@ -4498,15 +4498,15 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev, struct drm_i915_gem_object *obj; struct address_space *mapping; gfp_t mask; +int ret; obj = i915_gem_object_alloc(dev); if (obj == NULL) -return NULL ; +return ERR_PTR (-ENOMEM );The two changes above looked really really confusing, where one tests the returned pointer and returns it if it's an
ERR_PTR, and the other tests for NULL and returnsERR_PTR(-ENOMEM).
Quoted 2 lines
Then I realised one was
i915_gem_alloc_object()and the other wasi915_gem_object_alloc()!
Yep, noticed that a few days ago too, +1 on correcting it.
Regards, Joonas
Quoted 27 lines
Can we please get rid of one or the other? Since we generally use
subsystem_class_actionnaming, I'd suggest keeping (the low-level memory-allocator)i915_gem_object_alloc(), and renaming the high-leveli915_gem_alloc_object()toi915_gem_object_create()or similar.drivers/gpu/drm/i915/i915_gem.c struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev, · line 4543
Quoted 13 lines
drivers/gpu/drm/i915/i915_gem.c +3
-4-if (drm_gem_object_init (dev, &obj->base, size) !=0 ) { -i915_gem_object_free (obj); -return NULL ; - } + ret =drm_gem_object_init (dev, &obj->base, size); +if (ret) + goto fail; mask = GFP_HIGHUSER | __GFP_RECLAIMABLE; if (IS_CRESTLINE(dev) || IS_BROADWATER(dev)) {@@ -4543,6 +4543,11 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev, trace_i915_gem_object_create(obj);Oh and BTW
i915_gem_alloc_object()already calls itselfi915_gem_object_create()in trace messages!.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Propagate error from drm_gem_object_init()
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: drm/i915: Propagate error from drm_gem_object_init()
URL : https://patchwork.freedesktop.org/series/6149/
State : failure
== Summary ==
Series 6149v1 drm/i915: Propagate error from drm_gem_object_init()
http://patchwork.freedesktop.org/api/1.0/series/6149/revisions/1/mbox/
Test drv_module_reload_basic:
pass -> INCOMPLETE (skl-nuci5)
bdw-ultra total:193 pass:170 dwarn:0 dfail:0 fail:0 skip:23 bsw-nuc-2 total:192 pass:153 dwarn:0 dfail:0 fail:0 skip:39 byt-nuc total:192 pass:154 dwarn:0 dfail:0 fail:0 skip:38 ilk-hp8440p total:193 pass:136 dwarn:0 dfail:0 fail:0 skip:57 ivb-t430s total:193 pass:165 dwarn:0 dfail:0 fail:0 skip:28 skl-i7k-2 total:193 pass:168 dwarn:0 dfail:0 fail:0 skip:25 skl-nuci5 total:111 pass:103 dwarn:0 dfail:0 fail:0 skip:7 snb-dellxps total:193 pass:155 dwarn:0 dfail:0 fail:0 skip:38
Results at /archive/results/CI_IGT_test/Patchwork_2029/
340c485ad98d0ec0369a3b18d4a09938f3f5537d drm-intel-nightly: 2016y-04m-22d-17h-32m-25s UTC integration manifest 0836141 drm/i915: Propagate error from drm_gem_object_init()
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx