Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b96f3e7c authored Aug 05, 2019 by Gerd Hoffmann

drm/ttm: use gem vma_node



Drop vma_node from ttm_buffer_object, use the gem struct
(base.vma_node) instead.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190805140119.7337-9-kraxel@redhat.com

parent 1e053b10

drivers/gpu/drm/amd/amdgpu/amdgpu_object.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -191,7 +191,7 @@ static inline unsigned amdgpu_bo_gpu_page_alignment(struct amdgpu_bo *bo)
	*/		*/
	static inline u64 amdgpu_bo_mmap_offset(struct amdgpu_bo *bo)		static inline u64 amdgpu_bo_mmap_offset(struct amdgpu_bo *bo)
	{		{
	return drm_vma_node_offset_addr(&bo->tbo.vma_node);		return drm_vma_node_offset_addr(&bo->tbo.base.vma_node);
	}		}

	/**		/**

drivers/gpu/drm/drm_gem_vram_helper.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -168,7 +168,7 @@ EXPORT_SYMBOL(drm_gem_vram_put);
	*/		*/
	u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo)		u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo)
	{		{
	return drm_vma_node_offset_addr(&gbo->bo.vma_node);		return drm_vma_node_offset_addr(&gbo->bo.base.vma_node);
	}		}
	EXPORT_SYMBOL(drm_gem_vram_mmap_offset);		EXPORT_SYMBOL(drm_gem_vram_mmap_offset);

drivers/gpu/drm/nouveau/nouveau_display.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -675,7 +675,7 @@ nouveau_display_dumb_map_offset(struct drm_file *file_priv,
	gem = drm_gem_object_lookup(file_priv, handle);		gem = drm_gem_object_lookup(file_priv, handle);
	if (gem) {		if (gem) {
	struct nouveau_bo *bo = nouveau_gem_object(gem);		struct nouveau_bo *bo = nouveau_gem_object(gem);
	*poffset = drm_vma_node_offset_addr(&bo->bo.vma_node);		*poffset = drm_vma_node_offset_addr(&bo->bo.base.vma_node);
	drm_gem_object_put_unlocked(gem);		drm_gem_object_put_unlocked(gem);
	return 0;		return 0;
	}		}

drivers/gpu/drm/nouveau/nouveau_gem.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -240,7 +240,7 @@ nouveau_gem_info(struct drm_file file_priv, struct drm_gem_object gem,
	}		}

	rep->size = nvbo->bo.mem.num_pages << PAGE_SHIFT;		rep->size = nvbo->bo.mem.num_pages << PAGE_SHIFT;
	rep->map_handle = drm_vma_node_offset_addr(&nvbo->bo.vma_node);		rep->map_handle = drm_vma_node_offset_addr(&nvbo->bo.base.vma_node);
	rep->tile_mode = nvbo->mode;		rep->tile_mode = nvbo->mode;
	rep->tile_flags = nvbo->contig ? 0 : NOUVEAU_GEM_TILE_NONCONTIG;		rep->tile_flags = nvbo->contig ? 0 : NOUVEAU_GEM_TILE_NONCONTIG;
	if (cli->device.info.family >= NV_DEVICE_INFO_V0_FERMI)		if (cli->device.info.family >= NV_DEVICE_INFO_V0_FERMI)

drivers/gpu/drm/qxl/qxl_object.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,7 @@ static inline unsigned long qxl_bo_size(struct qxl_bo *bo)

	static inline u64 qxl_bo_mmap_offset(struct qxl_bo *bo)		static inline u64 qxl_bo_mmap_offset(struct qxl_bo *bo)
	{		{
	return drm_vma_node_offset_addr(&bo->tbo.vma_node);		return drm_vma_node_offset_addr(&bo->tbo.base.vma_node);
	}		}

	static inline int qxl_bo_wait(struct qxl_bo bo, u32 mem_type,		static inline int qxl_bo_wait(struct qxl_bo bo, u32 mem_type,