projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/modes: drop __drm_framebuffer_unregister.
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_mocs.c
diff --git
a/drivers/gpu/drm/i915/intel_mocs.c
b/drivers/gpu/drm/i915/intel_mocs.c
index fed7bea19cc94c41bf34352b6fb9b1a7b4c9f398..7c7ac0aa192a458108c67607dd57384d77efe2c0 100644
(file)
--- a/
drivers/gpu/drm/i915/intel_mocs.c
+++ b/
drivers/gpu/drm/i915/intel_mocs.c
@@
-159,7
+159,7
@@
static bool get_mocs_settings(struct drm_device *dev,
return result;
}
return result;
}
-static i915_reg_t mocs_register(enum intel_
ring
_id ring, int index)
+static i915_reg_t mocs_register(enum intel_
engine
_id ring, int index)
{
switch (ring) {
case RCS:
{
switch (ring) {
case RCS:
@@
-191,7
+191,7
@@
static i915_reg_t mocs_register(enum intel_ring_id ring, int index)
*/
static int emit_mocs_control_table(struct drm_i915_gem_request *req,
const struct drm_i915_mocs_table *table,
*/
static int emit_mocs_control_table(struct drm_i915_gem_request *req,
const struct drm_i915_mocs_table *table,
- enum intel_
ring
_id ring)
+ enum intel_
engine
_id ring)
{
struct intel_ringbuffer *ringbuf = req->ringbuf;
unsigned int index;
{
struct intel_ringbuffer *ringbuf = req->ringbuf;
unsigned int index;
@@
-322,14
+322,14
@@
int intel_rcs_context_init_mocs(struct drm_i915_gem_request *req)
struct drm_i915_mocs_table t;
int ret;
struct drm_i915_mocs_table t;
int ret;
- if (get_mocs_settings(req->
ring
->dev, &t)) {
+ if (get_mocs_settings(req->
engine
->dev, &t)) {
struct drm_i915_private *dev_priv = req->i915;
struct drm_i915_private *dev_priv = req->i915;
- struct intel_engine_cs *
ring
;
- enum intel_
ring_id ring_
id;
+ struct intel_engine_cs *
engine
;
+ enum intel_
engine_id
id;
/* Program the control registers */
/* Program the control registers */
- for_each_
ring(ring, dev_priv, ring_
id) {
- ret = emit_mocs_control_table(req, &t,
ring_
id);
+ for_each_
engine_id(engine, dev_priv,
id) {
+ ret = emit_mocs_control_table(req, &t, id);
if (ret)
return ret;
}
if (ret)
return ret;
}
This page took
0.03075 seconds
and
5
git commands to generate.