Skip to content
This repository was archived by the owner on Oct 3, 2024. It is now read-only.

Commit e156285

Browse files
icklezhenyw
authored andcommitted
drm/i915/gvt: Purge dev_priv->gt
Use the right intel_gt stored as a backpointer in intel_vgpu. Signed-off-by: Chris Wilson <[email protected]> Signed-off-by: Zhenyu Wang <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Zhenyu Wang <[email protected]>
1 parent 3a534c3 commit e156285

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

drivers/gpu/drm/i915/gvt/execlist.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -522,12 +522,11 @@ static void init_vgpu_execlist(struct intel_vgpu *vgpu,
522522
static void clean_execlist(struct intel_vgpu *vgpu,
523523
intel_engine_mask_t engine_mask)
524524
{
525-
struct drm_i915_private *dev_priv = vgpu->gvt->gt->i915;
526-
struct intel_engine_cs *engine;
527525
struct intel_vgpu_submission *s = &vgpu->submission;
526+
struct intel_engine_cs *engine;
528527
intel_engine_mask_t tmp;
529528

530-
for_each_engine_masked(engine, &dev_priv->gt, engine_mask, tmp) {
529+
for_each_engine_masked(engine, vgpu->gvt->gt, engine_mask, tmp) {
531530
kfree(s->ring_scan_buffer[engine->id]);
532531
s->ring_scan_buffer[engine->id] = NULL;
533532
s->ring_scan_buffer_size[engine->id] = 0;
@@ -537,11 +536,10 @@ static void clean_execlist(struct intel_vgpu *vgpu,
537536
static void reset_execlist(struct intel_vgpu *vgpu,
538537
intel_engine_mask_t engine_mask)
539538
{
540-
struct drm_i915_private *dev_priv = vgpu->gvt->gt->i915;
541539
struct intel_engine_cs *engine;
542540
intel_engine_mask_t tmp;
543541

544-
for_each_engine_masked(engine, &dev_priv->gt, engine_mask, tmp)
542+
for_each_engine_masked(engine, vgpu->gvt->gt, engine_mask, tmp)
545543
init_vgpu_execlist(vgpu, engine);
546544
}
547545

drivers/gpu/drm/i915/gvt/scheduler.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,13 +1046,12 @@ void intel_vgpu_clean_workloads(struct intel_vgpu *vgpu,
10461046
intel_engine_mask_t engine_mask)
10471047
{
10481048
struct intel_vgpu_submission *s = &vgpu->submission;
1049-
struct drm_i915_private *dev_priv = vgpu->gvt->gt->i915;
10501049
struct intel_engine_cs *engine;
10511050
struct intel_vgpu_workload *pos, *n;
10521051
intel_engine_mask_t tmp;
10531052

10541053
/* free the unsubmited workloads in the queues. */
1055-
for_each_engine_masked(engine, &dev_priv->gt, engine_mask, tmp) {
1054+
for_each_engine_masked(engine, vgpu->gvt->gt, engine_mask, tmp) {
10561055
list_for_each_entry_safe(pos, n,
10571056
&s->workload_q_head[engine->id], list) {
10581057
list_del_init(&pos->list);

0 commit comments

Comments
 (0)