diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-08-15 11:53:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-08-15 11:53:32 +1000 |
| commit | 57bca71dce1626092b6a2bc91225058af250a93f (patch) | |
| tree | 0bd3df87e8256ed471734f3f7c5612f4f1d2dad7 /drivers/gpu/drm/i915/gt/uc/selftest_guc.c | |
| parent | 2b9d7b6515220c30a596aba5633d675117f96500 (diff) | |
| parent | 788568fad4015406fa84fc86cefbef7c470c7c1f (diff) | |
Merge tag 'drm-intel-gt-next-2023-08-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
Cross-subsystem Changes:
- Backmerge of drm-next
Driver Changes:
- Apply workaround 22016122933 correctly (Jonathan, Matt R)
- Simplify shmem_create_from_object map_type selection (Jonathan,
Tvrtko)
- Make i915_coherent_map_type GT-centric (Jonathan, Matt R)
- Selftest improvements (John)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZNYR3bKFquGc7u9w@jlahtine-mobl.ger.corp.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gt/uc/selftest_guc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/selftest_guc.c b/drivers/gpu/drm/i915/gt/uc/selftest_guc.c index 1fd760539f77..bfb72143566f 100644 --- a/drivers/gpu/drm/i915/gt/uc/selftest_guc.c +++ b/drivers/gpu/drm/i915/gt/uc/selftest_guc.c @@ -204,9 +204,9 @@ static int intel_guc_steal_guc_ids(void *arg) if (IS_ERR(rq)) { ret = PTR_ERR(rq); rq = NULL; - if (ret != -EAGAIN) { - guc_err(guc, "Failed to create request %d: %pe\n", - context_index, ERR_PTR(ret)); + if ((ret != -EAGAIN) || !last) { + guc_err(guc, "Failed to create %srequest %d: %pe\n", + last ? "" : "first ", context_index, ERR_PTR(ret)); goto err_spin_rq; } } else { |