projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/i915: Make intel_display_suspend atomic, try 2.
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_gem_render_state.c
diff --git
a/drivers/gpu/drm/i915/i915_gem_render_state.c
b/drivers/gpu/drm/i915/i915_gem_render_state.c
index 521548a08578231334f95560c7ad79d3339dd5b9..a0201fc94d256431b41aa5ca26dbef0fae565257 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_render_state.c
+++ b/
drivers/gpu/drm/i915/i915_gem_render_state.c
@@
-152,29
+152,26
@@
int i915_gem_render_state_prepare(struct intel_engine_cs *ring,
return 0;
}
return 0;
}
-int i915_gem_render_state_init(struct
intel_engine_cs *ring
)
+int i915_gem_render_state_init(struct
drm_i915_gem_request *req
)
{
struct render_state so;
int ret;
{
struct render_state so;
int ret;
- ret = i915_gem_render_state_prepare(ring, &so);
+ ret = i915_gem_render_state_prepare(r
eq->r
ing, &so);
if (ret)
return ret;
if (so.rodata == NULL)
return 0;
if (ret)
return ret;
if (so.rodata == NULL)
return 0;
- ret = ring->dispatch_execbuffer(ring,
- so.ggtt_offset,
- so.rodata->batch_items * 4,
- I915_DISPATCH_SECURE);
+ ret = req->ring->dispatch_execbuffer(req, so.ggtt_offset,
+ so.rodata->batch_items * 4,
+ I915_DISPATCH_SECURE);
if (ret)
goto out;
if (ret)
goto out;
- i915_vma_move_to_active(i915_gem_obj_to_ggtt(so.obj), r
ing
);
+ i915_vma_move_to_active(i915_gem_obj_to_ggtt(so.obj), r
eq
);
- ret = __i915_add_request(ring, NULL, so.obj);
- /* __i915_add_request moves object to inactive if it fails */
out:
i915_gem_render_state_fini(&so);
return ret;
out:
i915_gem_render_state_fini(&so);
return ret;
This page took
0.074315 seconds
and
5
git commands to generate.