Commit 95162db0 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Thomas Hellström
Browse files

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: 75af93b3 ("drm/pagemap, drm/xe: Support destination migration over interconnect")
Fixes: 2df55d9e ("drm/xe: Support pcie p2p dma as a fast interconnect")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Link: https://patch.msgid.link/20260216134644.1025365-1-arnd@kernel.org


Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 08d05c73

drivers/gpu/drm/drm_gpusvm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}

drivers/gpu/drm/drm_pagemap.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/xe/xe_svm.c

+4 −4
Original line number Diff line number Diff line
@@ -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)

include/drm/drm_pagemap.h

+1 −1
Original line number Diff line number Diff line
@@ -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,