From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [PATCH 4/4] drm/xe: Annotate xe_ttm_stolen_mgr::mapping with __iomem
Date: Tue, 9 Jan 2024 12:24:05 +0100 [thread overview]
Message-ID: <20240109112405.108136-5-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20240109112405.108136-1-thomas.hellstrom@linux.intel.com>
The pointer points to IO memory, but the __iomem annotation was
incorrectly placed. Annotate it correctly, update its usage accordingly
and fix the corresponding sparse error.
Fixes: d8b52a02cb40 ("drm/xe: Implement stolen memory.")
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
index d2b00d0bf1e2..e5d7d5e2bec1 100644
--- a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
+++ b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
@@ -31,7 +31,7 @@ struct xe_ttm_stolen_mgr {
/* GPU base offset */
resource_size_t stolen_base;
- void *__iomem mapping;
+ void __iomem *mapping;
};
static inline struct xe_ttm_stolen_mgr *
@@ -275,7 +275,7 @@ static int __xe_ttm_stolen_io_mem_reserve_bar2(struct xe_device *xe,
drm_WARN_ON(&xe->drm, !(mem->placement & TTM_PL_FLAG_CONTIGUOUS));
if (mem->placement & TTM_PL_FLAG_CONTIGUOUS && mgr->mapping)
- mem->bus.addr = (u8 *)mgr->mapping + mem->bus.offset;
+ mem->bus.addr = (u8 __force *)mgr->mapping + mem->bus.offset;
mem->bus.offset += mgr->io_base;
mem->bus.is_iomem = true;
--
2.43.0
next prev parent reply other threads:[~2024-01-09 11:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-09 11:24 [PATCH 0/4] drm/xe: Silence a number of sparse warnings Thomas Hellström
2024-01-09 11:24 ` [PATCH 1/4] drm/xe: Use __iomem for the regs pointer Thomas Hellström
2024-01-09 14:48 ` Lucas De Marchi
2024-01-09 11:24 ` [PATCH 2/4] drm/xe: Annotate xe_mem_region::mapping with __iomem Thomas Hellström
2024-01-09 14:52 ` Lucas De Marchi
2024-01-09 11:24 ` [PATCH 3/4] drm/xe: Annotate multiple mmio pointers " Thomas Hellström
2024-01-09 14:53 ` Lucas De Marchi
2024-01-09 15:27 ` Matt Roper
2024-01-09 11:24 ` Thomas Hellström [this message]
2024-01-09 14:55 ` [PATCH 4/4] drm/xe: Annotate xe_ttm_stolen_mgr::mapping " Lucas De Marchi
2024-01-09 13:01 ` ✓ CI.Patch_applied: success for drm/xe: Silence a number of sparse warnings Patchwork
2024-01-09 13:01 ` ✗ CI.checkpatch: warning " Patchwork
2024-01-09 13:02 ` ✓ CI.KUnit: success " Patchwork
2024-01-09 13:10 ` ✓ CI.Build: " Patchwork
2024-01-09 13:10 ` ✓ CI.Hooks: " Patchwork
2024-01-09 13:11 ` ✓ CI.checksparse: " Patchwork
2024-01-09 13:46 ` ✓ CI.BAT: " 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=20240109112405.108136-5-thomas.hellstrom@linux.intel.com \
--to=thomas.hellstrom@linux.intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
/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