@@ -5432,13 +5432,8 @@ static void virtual_engine_initial_hint(struct virtual_engine *ve)
5432
5432
* typically be the first we inspect for submission.
5433
5433
*/
5434
5434
swp = prandom_u32_max (ve -> num_siblings );
5435
- if (!swp )
5436
- return ;
5437
-
5438
- swap (ve -> siblings [swp ], ve -> siblings [0 ]);
5439
- if (!intel_engine_has_relative_mmio (ve -> siblings [0 ]))
5440
- virtual_update_register_offsets (ve -> context .lrc_reg_state ,
5441
- ve -> siblings [0 ]);
5435
+ if (swp )
5436
+ swap (ve -> siblings [swp ], ve -> siblings [0 ]);
5442
5437
}
5443
5438
5444
5439
static int virtual_context_alloc (struct intel_context * ce )
@@ -5451,15 +5446,9 @@ static int virtual_context_alloc(struct intel_context *ce)
5451
5446
static int virtual_context_pin (struct intel_context * ce )
5452
5447
{
5453
5448
struct virtual_engine * ve = container_of (ce , typeof (* ve ), context );
5454
- int err ;
5455
5449
5456
5450
/* Note: we must use a real engine class for setting up reg state */
5457
- err = __execlists_context_pin (ce , ve -> siblings [0 ]);
5458
- if (err )
5459
- return err ;
5460
-
5461
- virtual_engine_initial_hint (ve );
5462
- return 0 ;
5451
+ return __execlists_context_pin (ce , ve -> siblings [0 ]);
5463
5452
}
5464
5453
5465
5454
static void virtual_context_enter (struct intel_context * ce )
@@ -5806,6 +5795,7 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings,
5806
5795
5807
5796
ve -> base .flags |= I915_ENGINE_IS_VIRTUAL ;
5808
5797
5798
+ virtual_engine_initial_hint (ve );
5809
5799
return & ve -> context ;
5810
5800
5811
5801
err_put :
0 commit comments