drm/i915: BUG_ON when ggtt_view is NULL
Subsystems (2)
PATCH 1/1 drm/i915: BUG_ON when ggtt_view is NULL
Lets BUG_ON and don't bother with a WARN and returning an error, so we can remove the need to pollute the code with error handling, after all it is a programmer error to provide NULL view. Also while we're here remove redundant NULL ggtt_view check.
--- drivers/gpu/drm/i915/i915_gem.c | 9 ++------- drivers/gpu/drm/i915/i915_gem_gtt.c | 10 +--------- 2 files changed, 3 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +2 -7
@@ -4235,9 +4235,6 @@ i915_gem_object_do_pin(struct drm_i915_gem_object *obj, vma = ggtt_view ?i915_gem_obj_to_ggtt_view (obj, ggtt_view) :i915_gem_obj_to_vma (obj, vm); -if (IS_ERR (vma)) -return PTR_ERR (vma); -if (vma) {if (WARN_ON (vma->pin_count ==DRM_I915_GEM_OBJECT_MAX_PIN_COUNT ))return -EBUSY ;
@@ -4300,8 +4297,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, uint32_t alignment, uint64_t flags) { -if (WARN_ONCE (!view,"no view specified" )) -return -EINVAL ; +BUG_ON (!view);return i915_gem_object_do_pin (obj,i915_obj_to_ggtt (obj), view, alignment, flags |PIN_GLOBAL );
@@ -4618,8 +4614,7 @@ struct i915_vma *i915_gem_obj_to_ggtt_view(struct drm_i915_gem_object *obj,struct i915_address_space *ggtt =i915_obj_to_ggtt (obj);struct i915_vma *vma; -if (WARN_ONCE (!view,"no view specified" )) -return ERR_PTR (-EINVAL ); +BUG_ON (!view);list_for_each_entry (vma, &obj->vma_list, obj_link) if (vma->vm == ggtt &&
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -9
@@ -3341,15 +3341,7 @@ i915_gem_obj_lookup_or_create_ggtt_vma(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) {struct i915_address_space *ggtt =i915_obj_to_ggtt (obj); -struct i915_vma *vma; - -if (WARN_ON (!view)) -return ERR_PTR (-EINVAL ); - - vma =i915_gem_obj_to_ggtt_view (obj, view); - -if (IS_ERR (vma)) -return vma; +struct i915_vma *vma =i915_gem_obj_to_ggtt_view (obj, view);if (!vma) vma =__i915_gem_vma_create (obj, ggtt, view);
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: BUG_ON when ggtt_view is NULL
== Series Details ==
== Series Details ==
Series: drm/i915: BUG_ON when ggtt_view is NULL
URL : https://patchwork.freedesktop.org/series/4869/
State : success
== Summary ==
Series 4869v1 drm/i915: BUG_ON when ggtt_view is NULL
http://patchwork.freedesktop.org/api/1.0/series/4869/revisions/1/mbox/
bdw-nuci7 total:192 pass:179 dwarn:0 dfail:0 fail:1 skip:12 bdw-ultra total:192 pass:170 dwarn:0 dfail:0 fail:1 skip:21 byt-nuc total:192 pass:156 dwarn:1 dfail:0 fail:0 skip:35 hsw-brixbox total:192 pass:170 dwarn:0 dfail:0 fail:0 skip:22 hsw-gt2 total:192 pass:175 dwarn:0 dfail:0 fail:0 skip:17 ivb-t430s total:192 pass:167 dwarn:0 dfail:0 fail:0 skip:25 snb-dellxps total:192 pass:158 dwarn:0 dfail:0 fail:0 skip:34 snb-x220t total:192 pass:158 dwarn:0 dfail:0 fail:1 skip:33
Results at /archive/results/CI_IGT_test/Patchwork_1714/
f5d413cccefa1f93d64c34f357151d42add63a84 drm-intel-nightly: 2016y-03m-24d-14h-34m-29s UTC integration manifest 2762cb3f5c3b27515488300257f4ebe7807a1670 drm/i915: BUG_ON when ggtt_view is NULL
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines · Matthew Auld
Lets
BUG_ONand don't bother with a WARN and returning an error, so we can remove the need to pollute the code with error handling, after all it is a programmer error to provide NULL view. Also while we're here remove redundant NULLggtt_viewcheck.Cc Joonas Lahtinen <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Matthew Auld <[email protected]>
Yeah, seems to have sprawled too much for not much gain. BUG_ON approved ;-)
Quoted 67 lines
--- drivers/gpu/drm/i915/i915_gem.c | 9 ++------- drivers/gpu/drm/i915/i915_gem_gtt.c | 10 +--------- 2 files changed, 3 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/i915_gem.c +2
-7@@ -4235,9 +4235,6 @@ i915_gem_object_do_pin(struct drm_i915_gem_object *obj, vma = ggtt_view ?i915_gem_obj_to_ggtt_view (obj, ggtt_view) :i915_gem_obj_to_vma (obj, vm); -if (IS_ERR (vma)) -return PTR_ERR (vma); -if (vma) {if (WARN_ON (vma->pin_count ==DRM_I915_GEM_OBJECT_MAX_PIN_COUNT ))return -EBUSY ;@@ -4300,8 +4297,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, uint32_t alignment, uint64_t flags) { -if (WARN_ONCE (!view,"no view specified" )) -return -EINVAL ; +BUG_ON (!view);return i915_gem_object_do_pin (obj,i915_obj_to_ggtt (obj), view, alignment, flags |PIN_GLOBAL );@@ -4618,8 +4614,7 @@ struct i915_vma *i915_gem_obj_to_ggtt_view(struct drm_i915_gem_object *obj,struct i915_address_space *ggtt =i915_obj_to_ggtt (obj);struct i915_vma *vma; -if (WARN_ONCE (!view,"no view specified" )) -return ERR_PTR (-EINVAL ); +BUG_ON (!view);list_for_each_entry (vma, &obj->vma_list, obj_link) if (vma->vm == ggtt &&drivers/gpu/drm/i915/i915_gem_gtt.c +1
-9@@ -3341,15 +3341,7 @@ i915_gem_obj_lookup_or_create_ggtt_vma(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) {struct i915_address_space *ggtt =i915_obj_to_ggtt (obj); -struct i915_vma *vma; - -if (WARN_ON (!view)) -return ERR_PTR (-EINVAL ); - - vma =i915_gem_obj_to_ggtt_view (obj, view); - -if (IS_ERR (vma)) -return vma; +struct i915_vma *vma =i915_gem_obj_to_ggtt_view (obj, view);if (!vma) vma =__i915_gem_vma_create (obj, ggtt, view);Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Matthew Auld
Lets
BUG_ONand don't bother with a WARN and returning an error, so we can remove the need to pollute the code with error handling, after all it is a programmer error to provide NULL view. Also while we're here remove redundant NULLggtt_viewcheck.Cc Joonas Lahtinen <[email protected]>Cc Tvrtko Ursulin <[email protected]>
Thanks for the patch, I'll merge.
Quoted 61 lines
Signed-off-by Matthew Auld <[email protected]>---
drivers/gpu/drm/i915/i915_gem.c | 9 ++-------drivers/gpu/drm/i915/i915_gem_gtt.c| 10 +---------2 files changed, 3 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/i915_gem.c +0
-0@@ -4235,9 +4235,6 @@ i915_gem_object_do_pin(struct drm_i915_gem_object *obj,vma =
ggtt_view?i915_gem_obj_to_ggtt_view(obj, ggtt_view):
i915_gem_obj_to_vma(obj, vm);drivers/gpu/drm/i915/i915_gem.c +0
-3-if (IS_ERR (vma)) -return PTR_ERR (vma); -if (vma) {
if (WARN_ON(vma->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT)) return-EBUSY;drivers/gpu/drm/i915/i915_gem.c +1
-2@@ -4300,8 +4297,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, uint32_t alignment, uint64_t flags) { -if (WARN_ONCE (!view,"no view specified" )) -return -EINVAL ; +BUG_ON (!view);
returni915_gem_object_do_pin(obj, i915_obj_to_ggtt(obj), view, alignment, flags | PIN_GLOBAL);drivers/gpu/drm/i915/i915_gem.c +0
-0@@ -4618,8 +4614,7 @@ struct i915_vma *i915_gem_obj_to_ggtt_view(struct drm_i915_gem_object *obj, struct i915_address_space *ggtt = i915_obj_to_ggtt(obj); struct i915_vma *vma;drivers/gpu/drm/i915/i915_gem.c +1
-2-if (WARN_ONCE (!view,"no view specified" )) -return ERR_PTR (-EINVAL ); +BUG_ON (!view);
list_for_each_entry(vma, &obj->vma_list, obj_link)if (vma->vm== ggtt &&drivers/gpu/drm/i915/i915_gem_gtt.c +1
-9@@ -3341,15 +3341,7 @@ i915_gem_obj_lookup_or_create_ggtt_vma(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) { struct i915_address_space *ggtt = i915_obj_to_ggtt(obj); -struct i915_vma *vma; - -if (WARN_ON (!view)) -return ERR_PTR (-EINVAL ); - - vma =i915_gem_obj_to_ggtt_view (obj, view); - -if (IS_ERR (vma)) -return vma; +struct i915_vma *vma =i915_gem_obj_to_ggtt_view (obj, view);
if (!vma)
vma =__i915_gem_vma_create(obj, ggtt, view);
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