diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-02-06 08:28:34 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-02-06 08:28:34 -0300 |
| commit | 9334030c3b94ca32af2e5afd02cb1c63307a2bea (patch) | |
| tree | 51bd44f141decad700255a716a6b6924d7e2faf4 /drivers/gpu/drm/i915/i915_gpu_error.c | |
| parent | fc45e6588d57b65378612fce07089276141509dc (diff) | |
| parent | 90c9e950c0def5c354b4a6154a2ddda3e5f214ac (diff) | |
| download | linux-9334030c3b94ca32af2e5afd02cb1c63307a2bea.tar.gz linux-9334030c3b94ca32af2e5afd02cb1c63307a2bea.tar.bz2 linux-9334030c3b94ca32af2e5afd02cb1c63307a2bea.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To check if more kernel API sync is needed and also to see if the perf
build tests continue to pass.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gpu_error.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gpu_error.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 5ae812d60abe..0633888a411e 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -1522,7 +1522,7 @@ capture_engine(struct intel_engine_cs *engine, struct i915_request *rq = NULL; unsigned long flags; - ee = intel_engine_coredump_alloc(engine, GFP_KERNEL); + ee = intel_engine_coredump_alloc(engine, ALLOW_FAIL); if (!ee) return NULL; |