[PATCH] drm/i915: remove i915_gem_object_ggtt_unbind

[PATCH] drm/i915: remove i915_gem_object_ggtt_unbind

[Matthew Auld]

Only has one user and is nothing more than a shim on top of
i915_vma_unbind, so let's just get rid of it.

Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Suggested-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h        | 6 ------
 drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 32f0597..3ccbe18 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3264,12 +3264,6 @@ i915_gem_obj_ggtt_pin(struct drm_i915_gem_object *obj,
 				   alignment, flags | PIN_GLOBAL);
 }
 
-static inline int
-i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj)
-{
-	return i915_vma_unbind(i915_gem_obj_to_ggtt(obj));
-}
-
 void i915_gem_object_ggtt_unpin_view(struct drm_i915_gem_object *obj,
 				     const struct i915_ggtt_view *view);
 static inline void
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 7410f6c..829dab6 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -229,7 +229,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
 		 */
 		if (obj->map_and_fenceable &&
 		    !i915_gem_object_fence_ok(obj, args->tiling_mode))
-			ret = i915_gem_object_ggtt_unbind(obj);
+			ret = i915_vma_unbind(i915_gem_obj_to_ggtt(obj));
 
 		if (ret == 0) {
 			if (obj->pages &&
-- 
2.4.11

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for drm/i915: remove i915_gem_object_ggtt_unbind

[Patchwork]

== Series Details ==

Series: drm/i915: remove i915_gem_object_ggtt_unbind
URL   : https://patchwork.freedesktop.org/series/6461/
State : failure

== Summary ==

Series 6461v1 drm/i915: remove i915_gem_object_ggtt_unbind
http://patchwork.freedesktop.org/api/1.0/series/6461/revisions/1/mbox/

Test drv_module_reload_basic:
                pass       -> INCOMPLETE (skl-nuci5)
Test gem_exec_create:
        Subgroup basic:
                pass       -> DMESG-WARN (ilk-hp8440p)

bdw-ultra        total:201  pass:176  dwarn:0   dfail:0   fail:0   skip:25 
bsw-nuc-2        total:200  pass:159  dwarn:0   dfail:0   fail:0   skip:41 
byt-nuc          total:200  pass:159  dwarn:0   dfail:0   fail:0   skip:41 
hsw-brixbox      total:201  pass:175  dwarn:0   dfail:0   fail:0   skip:26 
hsw-gt2          total:201  pass:179  dwarn:0   dfail:0   fail:1   skip:21 
ilk-hp8440p      total:201  pass:138  dwarn:2   dfail:0   fail:0   skip:61 
ivb-t430s        total:201  pass:170  dwarn:0   dfail:0   fail:0   skip:31 
skl-i7k-2        total:201  pass:174  dwarn:0   dfail:0   fail:0   skip:27 
skl-nuci5        total:29   pass:25   dwarn:0   dfail:0   fail:0   skip:3  
snb-dellxps      total:142  pass:109  dwarn:0   dfail:0   fail:0   skip:32 
snb-x220t        total:201  pass:159  dwarn:0   dfail:0   fail:1   skip:41 

Results at /archive/results/CI_IGT_test/Patchwork_2101/

4887074a38f11f6b5be255e54c97e7d0b2a0368b drm-intel-nightly: 2016y-04m-28d-11h-21m-01s UTC integration manifest
c11ef44 drm/i915: remove i915_gem_object_ggtt_unbind

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: ✗ Fi.CI.BAT: failure for drm/i915: remove i915_gem_object_ggtt_unbind

[Matthew Auld]

> Test drv_module_reload_basic:
>                 pass       -> INCOMPLETE (skl-nuci5)
Machine seems to have hanged after reloading module, couldn't possibly
be related to this patch. Will create new bug report...

> Test gem_exec_create:
>         Subgroup basic:
>                 pass       -> DMESG-WARN (ilk-hp8440p)
"Not enough space reserved (160 bytes) for adding the request (184
bytes)" - recently fixed by Chris.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: ✗ Fi.CI.BAT: failure for drm/i915: remove i915_gem_object_ggtt_unbind

[Joonas Lahtinen]

On ti, 2016-05-03 at 17:00 +0100, Matthew Auld wrote:
> > 
> > Test drv_module_reload_basic:
> >                 pass       -> INCOMPLETE (skl-nuci5)
> Machine seems to have hanged after reloading module, couldn't possibly
> be related to this patch. Will create new bug report...
> 
> > 
> > Test gem_exec_create:
> >         Subgroup basic:
> >                 pass       -> DMESG-WARN (ilk-hp8440p)
> "Not enough space reserved (160 bytes) for adding the request (184
> bytes)" - recently fixed by Chris.

Merged, thanks for the patch and opening the bug.

Regards, Joonas

> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx