]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/xe: avoid plain 64-bit division
authorArnd Bergmann <arnd@arndb.de>
Mon, 24 Mar 2025 21:06:02 +0000 (22:06 +0100)
committerLucas De Marchi <lucas.demarchi@intel.com>
Mon, 7 Apr 2025 20:16:07 +0000 (13:16 -0700)
Building the xe driver for i386 results in a link time warning:

x86_64-linux-ld: drivers/gpu/drm/xe/xe_migrate.o: in function `xe_migrate_vram':
xe_migrate.c:(.text+0x1e15): undefined reference to `__udivdi3'

Avoid this by using DIV_U64_ROUND_UP() instead of DIV_ROUND_UP().  The driver
is unlikely to be used on 32=bit hardware, so the extra cost here is not
too important.

Fixes: 9c44fd5f6e8a ("drm/xe: Add migrate layer functions for SVM support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20250324210612.2927194-1-arnd@kernel.org
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
(cherry picked from commit c9092257506af4985c085103714c403812a5bdcb)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/xe/xe_migrate.c

index a83bebef3780f79a1fe551688300b1e0556482df..5a3e89022c38124652231e9ee5873d5d91f0332a 100644 (file)
@@ -1547,7 +1547,7 @@ void xe_migrate_wait(struct xe_migrate *m)
 static u32 pte_update_cmd_size(u64 size)
 {
        u32 num_dword;
-       u64 entries = DIV_ROUND_UP(size, XE_PAGE_SIZE);
+       u64 entries = DIV_U64_ROUND_UP(size, XE_PAGE_SIZE);
 
        XE_WARN_ON(size > MAX_PREEMPTDISABLE_TRANSFER);
        /*
@@ -1558,7 +1558,7 @@ static u32 pte_update_cmd_size(u64 size)
         * 2 dword for the page table's physical location
         * 2*n dword for value of pte to fill (each pte entry is 2 dwords)
         */
-       num_dword = (1 + 2) * DIV_ROUND_UP(entries, 0x1ff);
+       num_dword = (1 + 2) * DIV_U64_ROUND_UP(entries, 0x1ff);
        num_dword += entries * 2;
 
        return num_dword;