On Thu, 07 Aug 2025, Qianfeng Rong <rongqianf...@vivo.com> wrote:
> Commit 16f5dfbc851b ("gfp: include __GFP_NOWARN in GFP_NOWAIT")
> made GFP_NOWAIT implicitly include __GFP_NOWARN.
>
> Therefore, explicit __GFP_NOWARN combined with GFP_NOWAIT
> (e.g., `GFP_NOWAIT | __GFP_NOWARN`) is now redundant. Let's clean
> up these redundant flags across subsystems.
>
> No functional changes.
>
> Signed-off-by: Qianfeng Rong <rongqianf...@vivo.com>
> ---
> drivers/gpu/drm/drm_modeset_lock.c | 4 ++--
Please separate the drm core changes...
> drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 ++--
> drivers/gpu/drm/i915/i915_active.c | 2 +-
...from the i915 driver changes.
Thanks,
Jani.
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c
> b/drivers/gpu/drm/drm_modeset_lock.c
> index beb91a13a312..58eac20a8138 100644
> --- a/drivers/gpu/drm/drm_modeset_lock.c
> +++ b/drivers/gpu/drm/drm_modeset_lock.c
> @@ -88,7 +88,7 @@ static noinline depot_stack_handle_t
> __drm_stack_depot_save(void)
>
> n = stack_trace_save(entries, ARRAY_SIZE(entries), 1);
>
> - return stack_depot_save(entries, n, GFP_NOWAIT | __GFP_NOWARN);
> + return stack_depot_save(entries, n, GFP_NOWAIT);
> }
>
> static void __drm_stack_depot_print(depot_stack_handle_t stack_depot)
> @@ -98,7 +98,7 @@ static void __drm_stack_depot_print(depot_stack_handle_t
> stack_depot)
> unsigned int nr_entries;
> char *buf;
>
> - buf = kmalloc(PAGE_SIZE, GFP_NOWAIT | __GFP_NOWARN);
> + buf = kmalloc(PAGE_SIZE, GFP_NOWAIT);
> if (!buf)
> return;
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
> b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
> index 8d4bb95f8424..22432912db2e 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
> @@ -220,7 +220,7 @@ static void heartbeat(struct work_struct *wrk)
> goto out;
> }
>
> - rq = heartbeat_create(ce, GFP_NOWAIT | __GFP_NOWARN);
> + rq = heartbeat_create(ce, GFP_NOWAIT);
> if (IS_ERR(rq))
> goto unlock;
>
> @@ -282,7 +282,7 @@ static int __intel_engine_pulse(struct intel_engine_cs
> *engine)
> GEM_BUG_ON(!intel_engine_has_preemption(engine));
> GEM_BUG_ON(!intel_engine_pm_is_awake(engine));
>
> - rq = heartbeat_create(ce, GFP_NOWAIT | __GFP_NOWARN);
> + rq = heartbeat_create(ce, GFP_NOWAIT);
> if (IS_ERR(rq))
> return PTR_ERR(rq);
>
> diff --git a/drivers/gpu/drm/i915/i915_active.c
> b/drivers/gpu/drm/i915/i915_active.c
> index 0dbc4e289300..402043cd84d5 100644
> --- a/drivers/gpu/drm/i915/i915_active.c
> +++ b/drivers/gpu/drm/i915/i915_active.c
> @@ -727,7 +727,7 @@ int i915_request_await_active(struct i915_request *rq,
> static int sw_await_fence(void *arg, struct dma_fence *fence)
> {
> return i915_sw_fence_await_dma_fence(arg, fence, 0,
> - GFP_NOWAIT | __GFP_NOWARN);
> + GFP_NOWAIT);
> }
>
> int i915_sw_fence_await_active(struct i915_sw_fence *fence,
--
Jani Nikula, Intel
