Driver Changes: - One copy/paste mistake fix. - One error path fix causing an error pointer dereference.
Unified · Split
| @@ -342,7 +342,7 @@ static void init_steering_oaddrm(struct xe_gt *gt) · 341 unmodified lines | |||
| 342 | else | 342 | else |
| 343 | gt->steering[OADDRM].group_target = 1; | 343 | gt->steering[OADDRM].group_target = 1; |
| 344 | 344 | ||
| 345 | gt->steering[DSS].instance_target = 0; /* unused */ | 345 | gt->steering[OADDRM].instance_target = 0; /* unused */ |
| 346 | } | 346 | } |
| 347 | 347 | ||
| 348 | static void init_steering_sqidi_psmi(struct xe_gt *gt) | 348 | static void init_steering_sqidi_psmi(struct xe_gt *gt) |
| @@ -357,8 +357,8 @@ static void init_steering_sqidi_psmi(struct xe_gt *gt) · 8 unmodified lines | |||
| 357 | 357 | ||
| 358 | static void init_steering_inst0(struct xe_gt *gt) | 358 | static void init_steering_inst0(struct xe_gt *gt) |
| 359 | { | 359 | { |
| 360 | gt->steering[DSS].group_target = 0; /* unused */ | 360 | gt->steering[INSTANCE0].group_target = 0; /* unused */ |
| 361 | gt->steering[DSS].instance_target = 0; /* unused */ | 361 | gt->steering[INSTANCE0].instance_target = 0; /* unused */ |
| 362 | } | 362 | } |
| 363 | 363 | ||
| 364 | static const struct { | 364 | static const struct { |
| @@ -1334,7 +1334,7 @@ xe_migrate_update_pgtables(struct xe_migrate *m, · 1333 unmodified lines | |||
| 1334 | GFP_KERNEL, true, 0); | 1334 | GFP_KERNEL, true, 0); |
| 1335 | if (IS_ERR(sa_bo)) { | 1335 | if (IS_ERR(sa_bo)) { |
| 1336 | err = PTR_ERR(sa_bo); | 1336 | err = PTR_ERR(sa_bo); |
| 1337 | goto err; | 1337 | goto err_bb; |
| 1338 | } | 1338 | } |
| 1339 | 1339 | ||
| 1340 | ppgtt_ofs = NUM_KERNEL_PDE + | 1340 | ppgtt_ofs = NUM_KERNEL_PDE + |
| @@ -1385,7 +1385,7 @@ xe_migrate_update_pgtables(struct xe_migrate *m, · 44 unmodified lines | |||
| 1385 | update_idx); | 1385 | update_idx); |
| 1386 | if (IS_ERR(job)) { | 1386 | if (IS_ERR(job)) { |
| 1387 | err = PTR_ERR(job); | 1387 | err = PTR_ERR(job); |
| 1388 | goto err_bb; | 1388 | goto err_sa; |
| 1389 | } | 1389 | } |
| 1390 | 1390 | ||
| 1391 | /* Wait on BO move */ | 1391 | /* Wait on BO move */ |
| @@ -1434,12 +1434,12 @@ xe_migrate_update_pgtables(struct xe_migrate *m, · 42 unmodified lines | |||
| 1434 | 1434 | ||
| 1435 | err_job: | 1435 | err_job: |
| 1436 | xe_sched_job_put(job); | 1436 | xe_sched_job_put(job); |
| 1437 | err_sa: | ||
| 1438 | drm_suballoc_free(sa_bo, NULL); | ||
| 1437 | err_bb: | 1439 | err_bb: |
| 1438 | if (!q) | 1440 | if (!q) |
| 1439 | mutex_unlock(&m->job_mutex); | 1441 | mutex_unlock(&m->job_mutex); |
| 1440 | xe_bb_free(bb, NULL); | 1442 | xe_bb_free(bb, NULL); |
| 1441 | err: | ||
| 1442 | drm_suballoc_free(sa_bo, NULL); | ||
| 1443 | return ERR_PTR(err); | 1443 | return ERR_PTR(err); |
| 1444 | } | 1444 | } |
| 1445 | 1445 | ||