drm/pagemap: pass pagemap_addr by reference

Passing a structure by value into a function is sometimes problematic,
for a number of reasons. Of of these is a warning from the 32-bit arm
compiler:

drivers/gpu/drm/drm_gpusvm.c: In function '__drm_gpusvm_unmap_pages':
drivers/gpu/drm/drm_gpusvm.c:1152:33: note: parameter passing for argument of type 'struct drm_pagemap_addr' changed in GCC 9.1
 1152 |                                 dpagemap->ops->device_unmap(dpagemap,
      |                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1153 |                                                             dev, *addr);
      |                                                             ~~~~~~~~~~~

This particular problem is harmless since we are not mixing compiler versions
inside of the compiler. However, passing this by reference avoids the warning
along with providing slightly better calling conventions as it avoids an
extra copy on the stack.

Fixes: 75af93b3f5d0 ("drm/pagemap, drm/xe: Support destination migration over interconnect")
Fixes: 2df55d9e66a2 ("drm/xe: Support pcie p2p dma as a fast interconnect")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Link: https://patch.msgid.link/20260216134644.1025365-1-arnd@kernel.org
Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
(cherry picked from commit 95162db0208aee122d10ac1342fe97a1721cd258)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/drm_gpusvm.c b/drivers/gpu/drm/drm_gpusvm.c
index aa9a0b60e727ec0ab85dd19bccc2f538a466b045..a799447a75757f6cee17367931fd93ff28f242a3 100644 (file)
--- a/drivers/gpu/drm/drm_gpusvm.c
+++ b/drivers/gpu/drm/drm_gpusvm.c
@@ -1150,7 +1150,7 @@ static void __drm_gpusvm_unmap_pages(struct drm_gpusvm *gpusvm,
                                               addr->dir);
                        else if (dpagemap && dpagemap->ops->device_unmap)
                                dpagemap->ops->device_unmap(dpagemap,
-                                                           dev, *addr);
+                                                           dev, addr);
                        i += 1 << addr->order;
                }
 

diff --git a/drivers/gpu/drm/drm_pagemap.c b/drivers/gpu/drm/drm_pagemap.c
index 03ee39a761a41cee8155ec522891daf3eea9e4d8..1ea00ff308e24c28a48018996d6f13b1fa8c2696 100644 (file)
--- a/drivers/gpu/drm/drm_pagemap.c
+++ b/drivers/gpu/drm/drm_pagemap.c
@@ -318,7 +318,7 @@ static void drm_pagemap_migrate_unmap_pages(struct device *dev,
                        struct drm_pagemap_zdd *zdd = page->zone_device_data;
                        struct drm_pagemap *dpagemap = zdd->dpagemap;
 
-                       dpagemap->ops->device_unmap(dpagemap, dev, pagemap_addr[i]);
+                       dpagemap->ops->device_unmap(dpagemap, dev, &pagemap_addr[i]);
                } else {
                        dma_unmap_page(dev, pagemap_addr[i].addr,
                                       PAGE_SIZE << pagemap_addr[i].order, dir);

diff --git a/drivers/gpu/drm/xe/xe_svm.c b/drivers/gpu/drm/xe/xe_svm.c
index 213f0334518a467255930391267c974b7c1fdaf2..78f4b2c60670a5bdfe009daff336a5115717cd79 100644 (file)
--- a/drivers/gpu/drm/xe/xe_svm.c
+++ b/drivers/gpu/drm/xe/xe_svm.c
@@ -1676,13 +1676,13 @@ xe_drm_pagemap_device_map(struct drm_pagemap *dpagemap,
 
 static void xe_drm_pagemap_device_unmap(struct drm_pagemap *dpagemap,
                                        struct device *dev,
-                                       struct drm_pagemap_addr addr)
+                                       const struct drm_pagemap_addr *addr)
 {
-       if (addr.proto != XE_INTERCONNECT_P2P)
+       if (addr->proto != XE_INTERCONNECT_P2P)
                return;
 
-       dma_unmap_resource(dev, addr.addr, PAGE_SIZE << addr.order,
-                          addr.dir, DMA_ATTR_SKIP_CPU_SYNC);
+       dma_unmap_resource(dev, addr->addr, PAGE_SIZE << addr->order,
+                          addr->dir, DMA_ATTR_SKIP_CPU_SYNC);
 }
 
 static void xe_pagemap_destroy_work(struct work_struct *work)

diff --git a/include/drm/drm_pagemap.h b/include/drm/drm_pagemap.h
index 2baf0861f78f30decb1f054dcb48c33def290832..c848f578e3daa69bf126ca2a16d45629a5381f2a 100644 (file)
--- a/include/drm/drm_pagemap.h
+++ b/include/drm/drm_pagemap.h
@@ -95,7 +95,7 @@ struct drm_pagemap_ops {
         */
        void (*device_unmap)(struct drm_pagemap *dpagemap,
                             struct device *dev,
-                            struct drm_pagemap_addr addr);
+                            const struct drm_pagemap_addr *addr);
 
        /**
         * @populate_mm: Populate part of the mm with @dpagemap memory,