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

drm/i915: Update init_context() to take a request structure 

Now that everything above has been converted to use requests, it is possible to
update init_context() to take a request pointer instead of a ring/context pair.

For: VIZ-5115
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Tomas Elf <tomas.elf@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
John Harrison 2015-05-29 17:43:44 +01:00 committed by Daniel Vetter
parent 76c3916887
commit 8753181e10
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_gem_context.c
View File

@ -418,7 +418,7 @@ int i915_gem_context_enable(struct drm_i915_gem_request *req)
if (ring->init_context == NULL)
return 0;
ret = ring->init_context(ring, ring->default_context);
ret = ring->init_context(req);
} else
ret = i915_switch_context(req);
@ -760,7 +760,7 @@ done:
if (uninitialized) {
if (ring->init_context) {
ret = ring->init_context(ring, to);
ret = ring->init_context(req);
if (ret)
DRM_ERROR("ring init context: %d\n", ret);
}

9
drivers/gpu/drm/i915/intel_lrc.c
View File

@ -1602,16 +1602,15 @@ out:
return ret;
}
static int gen8_init_rcs_context(struct intel_engine_cs *ring,
struct intel_context *ctx)
static int gen8_init_rcs_context(struct drm_i915_gem_request *req)
{
int ret;
ret = intel_logical_ring_workarounds_emit(ring, ctx);
ret = intel_logical_ring_workarounds_emit(req->ring, req->ctx);
if (ret)
return ret;
return intel_lr_context_render_state_init(ring, ctx);
return intel_lr_context_render_state_init(req->ring, req->ctx);
}
/**
@ -2236,7 +2235,7 @@ int intel_lr_context_deferred_create(struct intel_context *ctx,
if (ret)
return ret;
ret = ring->init_context(req->ring, ctx);
ret = ring->init_context(req);
if (ret) {
DRM_ERROR("ring init context: %d\n", ret);
i915_gem_request_cancel(req);

7
drivers/gpu/drm/i915/intel_ringbuffer.c
View File

@ -742,16 +742,15 @@ static int intel_ring_workarounds_emit(struct intel_engine_cs *ring,
return 0;
}
static int intel_rcs_ctx_init(struct intel_engine_cs *ring,
struct intel_context *ctx)
static int intel_rcs_ctx_init(struct drm_i915_gem_request *req)
{
int ret;
ret = intel_ring_workarounds_emit(ring, ctx);
ret = intel_ring_workarounds_emit(req->ring, req->ctx);
if (ret != 0)
return ret;
ret = i915_gem_render_state_init(ring);
ret = i915_gem_render_state_init(req->ring);
if (ret)
DRM_ERROR("init render state: %d\n", ret);

3
drivers/gpu/drm/i915/intel_ringbuffer.h
View File

@ -176,8 +176,7 @@ struct intel_engine_cs {
int (*init_hw)(struct intel_engine_cs *ring);
int (*init_context)(struct intel_engine_cs *ring,
struct intel_context *ctx);
int (*init_context)(struct drm_i915_gem_request *req);
void (*write_tail)(struct intel_engine_cs *ring,
u32 value);