| Message ID | 1461842691-27575-1-git-send-email-matthew.auld@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> 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.
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
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 &&
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(-)