Commit 81aa3c7c authored by Francois Dugast's avatar Francois Dugast
Browse files

drm/pagemap: Rename drm_pagemap_device_addr to drm_pagemap_addr 



Rename this struct to the more generic name drm_pagemap_addr so it can be
used in a broader context, such as DMA mappings of CPU memory.

Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://lore.kernel.org/r/20250805140028.599361-2-francois.dugast@intel.com


Signed-off-by: default avatarFrancois Dugast <francois.dugast@intel.com>
parent ca0ed3b1

drivers/gpu/drm/drm_gpusvm.c

+2 −2
Original line number Diff line number Diff line
@@ -1048,7 +1048,7 @@ static void __drm_gpusvm_range_unmap_pages(struct drm_gpusvm *gpusvm, 
		};



		for (i = 0, j = 0; i < npages; j++) {

			struct drm_pagemap_device_addr *addr = &range->dma_addr[j];

			struct drm_pagemap_addr *addr = &range->dma_addr[j];



			if (addr->proto == DRM_INTERCONNECT_SYSTEM)

				dma_unmap_page(dev,
@@ -1400,7 +1400,7 @@ int drm_gpusvm_range_get_pages(struct drm_gpusvm *gpusvm, 
				goto err_unmap;

			}



			range->dma_addr[j] = drm_pagemap_device_addr_encode

			range->dma_addr[j] = drm_pagemap_addr_encode

				(addr, DRM_INTERCONNECT_SYSTEM, order,

				 DMA_BIDIRECTIONAL);

		}

drivers/gpu/drm/xe/xe_res_cursor.h

+5 −5
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ struct xe_res_cursor { 
	u32 mem_type;

	/** @sgl: Scatterlist for cursor */

	struct scatterlist *sgl;

	/** @dma_addr: Current element in a struct drm_pagemap_device_addr array */

	const struct drm_pagemap_device_addr *dma_addr;

	/** @dma_addr: Current element in a struct drm_pagemap_addr array */

	const struct drm_pagemap_addr *dma_addr;

	/** @mm: Buddy allocator for VRAM cursor */

	struct drm_buddy *mm;

	/**
@@ -170,7 +170,7 @@ static inline void __xe_res_sg_next(struct xe_res_cursor *cur) 
 */

static inline void __xe_res_dma_next(struct xe_res_cursor *cur)

{

	const struct drm_pagemap_device_addr *addr = cur->dma_addr;

	const struct drm_pagemap_addr *addr = cur->dma_addr;

	u64 start = cur->start;



	while (start >= cur->dma_seg_size) {
@@ -222,14 +222,14 @@ static inline void xe_res_first_sg(const struct sg_table *sg, 
/**

 * xe_res_first_dma - initialize a xe_res_cursor with dma_addr array

 *

 * @dma_addr: struct drm_pagemap_device_addr array to walk

 * @dma_addr: struct drm_pagemap_addr array to walk

 * @start: Start of the range

 * @size: Size of the range

 * @cur: cursor object to initialize

 *

 * Start walking over the range of allocations between @start and @size.

 */

static inline void xe_res_first_dma(const struct drm_pagemap_device_addr *dma_addr,

static inline void xe_res_first_dma(const struct drm_pagemap_addr *dma_addr,

				    u64 start, u64 size,

				    struct xe_res_cursor *cur)

{

drivers/gpu/drm/xe/xe_svm.c

+2 −2
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ int xe_svm_alloc_vram(struct xe_tile *tile, struct xe_svm_range *range, 
				       ctx->timeslice_ms);

}



static struct drm_pagemap_device_addr

static struct drm_pagemap_addr

xe_drm_pagemap_device_map(struct drm_pagemap *dpagemap,

			  struct device *dev,

			  struct page *page,
@@ -1033,7 +1033,7 @@ xe_drm_pagemap_device_map(struct drm_pagemap *dpagemap, 
		prot = 0;

	}



	return drm_pagemap_device_addr_encode(addr, prot, order, dir);

	return drm_pagemap_addr_encode(addr, prot, order, dir);

}



static const struct drm_pagemap_ops xe_drm_pagemap_ops = {

drivers/gpu/drm/xe/xe_svm.h

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ void xe_svm_flush(struct xe_vm *vm); 
#else

#include <linux/interval_tree.h>



struct drm_pagemap_device_addr;

struct drm_pagemap_addr;

struct drm_gpusvm_ctx;

struct drm_gpusvm_range;

struct xe_bo;
@@ -178,7 +178,7 @@ struct xe_vram_region; 
struct xe_svm_range {

	struct {

		struct interval_tree_node itree;

		const struct drm_pagemap_device_addr *dma_addr;

		const struct drm_pagemap_addr *dma_addr;

	} base;

	u32 tile_present;

	u32 tile_invalidated;

include/drm/drm_gpusvm.h

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct drm_gpusvm_notifier; 
struct drm_gpusvm_ops;

struct drm_gpusvm_range;

struct drm_pagemap;

struct drm_pagemap_device_addr;

struct drm_pagemap_addr;



/**

 * struct drm_gpusvm_ops - Operations structure for GPU SVM
@@ -154,7 +154,7 @@ struct drm_gpusvm_range { 
	struct interval_tree_node itree;

	struct list_head entry;

	unsigned long notifier_seq;

	struct drm_pagemap_device_addr *dma_addr;

	struct drm_pagemap_addr *dma_addr;

	struct drm_pagemap *dpagemap;

	struct drm_gpusvm_range_flags flags;

};