diff options
| author | John Harrison <John.C.Harrison@Intel.com> | 2015-05-29 17:43:40 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 14:02:09 +0200 |
| commit | b3dd6b9681e4116bce4dd1145cb162a5a48bac8e (patch) | |
| tree | ef76fec90bb6303a8c13dc4b80951b072d5f2ab4 /drivers/gpu/drm/i915/i915_gem_context.c | |
| parent | dc4be6071a24f0d2da6af8ce16c19f276ac4d7a2 (diff) | |
| download | blackbird-obmc-linux-b3dd6b9681e4116bce4dd1145cb162a5a48bac8e.tar.gz blackbird-obmc-linux-b3dd6b9681e4116bce4dd1145cb162a5a48bac8e.zip | |
drm/i915: Update ppgtt_init_ring() & context_enable() to take requests
The final step in removing the OLR from i915_gem_init_hw() is to pass the newly
allocated request structure in to each step rather than passing a ring
structure. This patch updates both i915_ppgtt_init_ring() and
i915_gem_context_enable() to take request pointers.
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_context.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 9687d00c4b92..4514d5aa5a93 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -409,8 +409,9 @@ void i915_gem_context_fini(struct drm_device *dev) i915_gem_context_unreference(dctx); } -int i915_gem_context_enable(struct intel_engine_cs *ring) +int i915_gem_context_enable(struct drm_i915_gem_request *req) { + struct intel_engine_cs *ring = req->ring; int ret; if (i915.enable_execlists) { |
