| From d8e1903a39aaef8b8a7b159046a238d3e9148627 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 3 Feb 2026 20:37:45 +0100 |
| Subject: drm/xe/configfs: Fix 'parameter name omitted' errors |
| |
| From: Michal Wajdeczko <michal.wajdeczko@intel.com> |
| |
| [ Upstream commit 2a673fb4d787ce6672862cb693112378bff86abb ] |
| |
| On some configs and old compilers we can get following build errors: |
| |
| ../drivers/gpu/drm/xe/xe_configfs.h: In function 'xe_configfs_get_ctx_restore_mid_bb': |
| ../drivers/gpu/drm/xe/xe_configfs.h:40:76: error: parameter name omitted |
| static inline u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev, enum xe_engine_class, |
| ^~~~~~~~~~~~~~~~~~~~ |
| ../drivers/gpu/drm/xe/xe_configfs.h: In function 'xe_configfs_get_ctx_restore_post_bb': |
| ../drivers/gpu/drm/xe/xe_configfs.h:42:77: error: parameter name omitted |
| static inline u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev, enum xe_engine_class, |
| ^~~~~~~~~~~~~~~~~~~~ |
| when trying to define our configfs stub functions. Fix that. |
| |
| Fixes: 7a4756b2fd04 ("drm/xe/lrc: Allow to add user commands mid context switch") |
| Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> |
| Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Reviewed-by: Shuicheng Lin <shuicheng.lin@intel.com> |
| Link: https://patch.msgid.link/20260203193745.576-1-michal.wajdeczko@intel.com |
| (cherry picked from commit f59cde8a2452b392115d2af8f1143a94725f4827) |
| Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/xe/xe_configfs.h | 12 ++++++++---- |
| 1 file changed, 8 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/xe/xe_configfs.h b/drivers/gpu/drm/xe/xe_configfs.h |
| index fed57be0b90e1..f3683bc7eb90c 100644 |
| --- a/drivers/gpu/drm/xe/xe_configfs.h |
| +++ b/drivers/gpu/drm/xe/xe_configfs.h |
| @@ -21,9 +21,11 @@ bool xe_configfs_primary_gt_allowed(struct pci_dev *pdev); |
| bool xe_configfs_media_gt_allowed(struct pci_dev *pdev); |
| u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev); |
| bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev); |
| -u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev, enum xe_engine_class, |
| +u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev, |
| + enum xe_engine_class class, |
| const u32 **cs); |
| -u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev, enum xe_engine_class, |
| +u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev, |
| + enum xe_engine_class class, |
| const u32 **cs); |
| #ifdef CONFIG_PCI_IOV |
| unsigned int xe_configfs_get_max_vfs(struct pci_dev *pdev); |
| @@ -37,9 +39,11 @@ static inline bool xe_configfs_primary_gt_allowed(struct pci_dev *pdev) { return |
| static inline bool xe_configfs_media_gt_allowed(struct pci_dev *pdev) { return true; } |
| static inline u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev) { return U64_MAX; } |
| static inline bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev) { return false; } |
| -static inline u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev, enum xe_engine_class, |
| +static inline u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev, |
| + enum xe_engine_class class, |
| const u32 **cs) { return 0; } |
| -static inline u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev, enum xe_engine_class, |
| +static inline u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev, |
| + enum xe_engine_class class, |
| const u32 **cs) { return 0; } |
| static inline unsigned int xe_configfs_get_max_vfs(struct pci_dev *pdev) { return UINT_MAX; } |
| #endif |
| -- |
| 2.51.0 |
| |
