From 963ad1285b7c7c5e4c75c2aa108ace866010e9bc Mon Sep 17 00:00:00 2001 From: Matthew Auld Date: Sat, 10 Aug 2019 10:17:47 +0100 Subject: drm/i915/blt: don't assume pinned intel_context Currently we just pass in bcs0->engine_context so it matters not, but in the future we may want to pass in something that is not a kernel_context, so try to be a bit more generic. Suggested-by: Chris Wilson Signed-off-by: Matthew Auld Cc: Chris Wilson Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20190810091748.10972-1-chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 3 ++- drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c index de6616bdb3a6..08a84c940d8d 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c @@ -4,6 +4,7 @@ */ #include "i915_drv.h" +#include "gt/intel_context.h" #include "i915_gem_client_blt.h" #include "i915_gem_object_blt.h" @@ -175,7 +176,7 @@ static void clear_pages_worker(struct work_struct *work) if (unlikely(err)) goto out_unlock; - rq = i915_request_create(w->ce); + rq = intel_context_create_request(w->ce); if (IS_ERR(rq)) { err = PTR_ERR(rq); goto out_unpin; diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c index 837dd6636dd1..fa90c38c8b07 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c @@ -4,6 +4,7 @@ */ #include "i915_drv.h" +#include "gt/intel_context.h" #include "i915_gem_clflush.h" #include "i915_gem_object_blt.h" @@ -64,7 +65,7 @@ int i915_gem_object_fill_blt(struct drm_i915_gem_object *obj, i915_gem_object_unlock(obj); } - rq = i915_request_create(ce); + rq = intel_context_create_request(ce); if (IS_ERR(rq)) { err = PTR_ERR(rq); goto out_unpin; -- cgit v1.2.3