UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <chris@chris-wilson.co.uk>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190810091748.10972-1-chris@chris-wilson.co.uk
This commit is contained in:
Matthew Auld 2019-08-10 10:17:47 +01:00 committed by Chris Wilson
parent 0a9b26306d
commit 963ad1285b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/i915/gem/i915_gem_client_blt.c
View File

@ -4,6 +4,7 @@
*/ */
#include "i915_drv.h" #include "i915_drv.h"
#include "gt/intel_context.h"
#include "i915_gem_client_blt.h" #include "i915_gem_client_blt.h"
#include "i915_gem_object_blt.h" #include "i915_gem_object_blt.h"
@ -175,7 +176,7 @@ static void clear_pages_worker(struct work_struct *work)
if (unlikely(err)) if (unlikely(err))
goto out_unlock; goto out_unlock;
rq = i915_request_create(w->ce); rq = intel_context_create_request(w->ce);
if (IS_ERR(rq)) { if (IS_ERR(rq)) {
err = PTR_ERR(rq); err = PTR_ERR(rq);
goto out_unpin; goto out_unpin;

3
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
View File

@ -4,6 +4,7 @@
*/ */
#include "i915_drv.h" #include "i915_drv.h"
#include "gt/intel_context.h"
#include "i915_gem_clflush.h" #include "i915_gem_clflush.h"
#include "i915_gem_object_blt.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); i915_gem_object_unlock(obj);
} }
rq = i915_request_create(ce); rq = intel_context_create_request(ce);
if (IS_ERR(rq)) { if (IS_ERR(rq)) {
err = PTR_ERR(rq); err = PTR_ERR(rq);
goto out_unpin; goto out_unpin;