From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"José Roberto de Souza" <jose.souza@intel.com>,
stable@vger.kernel.org
Subject: [PATCH 2/4] drm/xe/vm: Fix a misplaced #endif
Date: Wed, 26 Feb 2025 16:33:42 +0100 [thread overview]
Message-ID: <20250226153344.58175-3-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20250226153344.58175-1-thomas.hellstrom@linux.intel.com>
Fix a (harmless) misplaced #endif leading to declarations
appearing multiple times.
Fixes: 0eb2a18a8fad ("drm/xe: Implement VM snapshot support for BO's and userptr")
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: <stable@vger.kernel.org> # v6.9+
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
drivers/gpu/drm/xe/xe_vm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_vm.h b/drivers/gpu/drm/xe/xe_vm.h
index f66075f8a6fe..7c8e39049223 100644
--- a/drivers/gpu/drm/xe/xe_vm.h
+++ b/drivers/gpu/drm/xe/xe_vm.h
@@ -282,9 +282,9 @@ static inline void vm_dbg(const struct drm_device *dev,
const char *format, ...)
{ /* noop */ }
#endif
-#endif
struct xe_vm_snapshot *xe_vm_snapshot_capture(struct xe_vm *vm);
void xe_vm_snapshot_capture_delayed(struct xe_vm_snapshot *snap);
void xe_vm_snapshot_print(struct xe_vm_snapshot *snap, struct drm_printer *p);
void xe_vm_snapshot_free(struct xe_vm_snapshot *snap);
+#endif
--
2.48.1
next prev parent reply other threads:[~2025-02-26 15:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-26 15:33 [PATCH 0/4] drm/xe: Fix userptr races and missed validations Thomas Hellström
2025-02-26 15:33 ` [PATCH 1/4] drm/xe/vm: Validate userptr during gpu vma prefetching Thomas Hellström
2025-02-26 15:40 ` Matthew Brost
2025-02-26 15:46 ` Thomas Hellström
2025-02-26 15:33 ` Thomas Hellström [this message]
2025-02-26 17:03 ` [PATCH 2/4] drm/xe/vm: Fix a misplaced #endif Lucas De Marchi
2025-02-27 5:04 ` Upadhyay, Tejas
2025-02-26 15:33 ` [PATCH 3/4] drm/xe: Fix fault mode invalidation with unbind Thomas Hellström
2025-02-27 7:03 ` Matthew Brost
2025-02-26 15:33 ` [PATCH 4/4] drm/xe: Add staging tree for VM binds Thomas Hellström
2025-02-26 16:25 ` Thomas Hellström
2025-02-26 16:18 ` ✓ CI.Patch_applied: success for drm/xe: Fix userptr races and missed validations Patchwork
2025-02-26 16:19 ` ✓ CI.checkpatch: " Patchwork
2025-02-26 16:20 ` ✓ CI.KUnit: " Patchwork
2025-02-26 16:38 ` ✓ CI.Build: " Patchwork
2025-02-26 16:41 ` ✓ CI.Hooks: " Patchwork
2025-02-26 16:42 ` ✓ CI.checksparse: " Patchwork
2025-02-26 17:02 ` ✓ Xe.CI.BAT: " Patchwork
2025-02-26 18:08 ` ✗ Xe.CI.Full: failure " Patchwork
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=20250226153344.58175-3-thomas.hellstrom@linux.intel.com \
--to=thomas.hellstrom@linux.intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=jose.souza@intel.com \
--cc=maarten.lankhorst@linux.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;
as well as URLs for NNTP newsgroup(s).