From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, daniele.ceraolospurio@intel.com
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.14.y] drm/xe/gsc: do not flush the GSC worker from the reset path
Date: Wed, 14 May 2025 16:13:05 -0400 [thread overview]
Message-ID: <20250514095358-3685068562756ee9@stable.kernel.org> (raw)
In-Reply-To: <20250513233056.2986393-1-daniele.ceraolospurio@intel.com>
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 03552d8ac0afcc080c339faa0b726e2c0e9361cb
Note: The patch differs from the upstream commit:
---
1: 03552d8ac0afc ! 1: ec3abfe7a63b2 drm/xe/gsc: do not flush the GSC worker from the reset path
@@ Commit message
Link: https://lore.kernel.org/r/20250502155104.2201469-1-daniele.ceraolospurio@intel.com
(cherry picked from commit 12370bfcc4f0bdf70279ec5b570eb298963422b5)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
+ (cherry picked from commit 03552d8ac0afcc080c339faa0b726e2c0e9361cb)
## drivers/gpu/drm/xe/xe_gsc.c ##
-@@ drivers/gpu/drm/xe/xe_gsc.c: void xe_gsc_wait_for_worker_completion(struct xe_gsc *gsc)
- flush_work(&gsc->work);
+@@ drivers/gpu/drm/xe/xe_gsc.c: void xe_gsc_remove(struct xe_gsc *gsc)
+ xe_gsc_proxy_remove(gsc);
}
+void xe_gsc_stop_prepare(struct xe_gsc *gsc)
@@ drivers/gpu/drm/xe/xe_gsc.h: struct xe_hw_engine;
void xe_gsc_wait_for_worker_completion(struct xe_gsc *gsc);
+void xe_gsc_stop_prepare(struct xe_gsc *gsc);
void xe_gsc_load_start(struct xe_gsc *gsc);
+ void xe_gsc_remove(struct xe_gsc *gsc);
void xe_gsc_hwe_irq_handler(struct xe_hw_engine *hwe, u16 intr_vec);
-
## drivers/gpu/drm/xe/xe_gsc_proxy.c ##
@@ drivers/gpu/drm/xe/xe_gsc_proxy.c: bool xe_gsc_proxy_init_done(struct xe_gsc *gsc)
@@ drivers/gpu/drm/xe/xe_gsc_proxy.c: bool xe_gsc_proxy_init_done(struct xe_gsc *gs
## drivers/gpu/drm/xe/xe_gsc_proxy.h ##
@@ drivers/gpu/drm/xe/xe_gsc_proxy.h: struct xe_gsc;
-
int xe_gsc_proxy_init(struct xe_gsc *gsc);
bool xe_gsc_proxy_init_done(struct xe_gsc *gsc);
+ void xe_gsc_proxy_remove(struct xe_gsc *gsc);
+int xe_gsc_wait_for_proxy_init_done(struct xe_gsc *gsc);
int xe_gsc_proxy_start(struct xe_gsc *gsc);
@@ drivers/gpu/drm/xe/xe_uc.h: int xe_uc_reset_prepare(struct xe_uc *uc);
+void xe_uc_suspend_prepare(struct xe_uc *uc);
int xe_uc_suspend(struct xe_uc *uc);
int xe_uc_sanitize_reset(struct xe_uc *uc);
- void xe_uc_declare_wedged(struct xe_uc *uc);
+ void xe_uc_remove(struct xe_uc *uc);
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.14.y | Success | Success |
next prev parent reply other threads:[~2025-05-14 20:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-12 10:06 FAILED: patch "[PATCH] drm/xe/gsc: do not flush the GSC worker from the reset path" failed to apply to 6.14-stable tree gregkh
2025-05-13 23:30 ` [PATCH 6.14.y] drm/xe/gsc: do not flush the GSC worker from the reset path Daniele Ceraolo Spurio
2025-05-14 20:13 ` Sasha Levin [this message]
2025-05-19 18:46 ` Daniele Ceraolo Spurio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250514095358-3685068562756ee9@stable.kernel.org \
--to=sashal@kernel.org \
--cc=daniele.ceraolospurio@intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox