drm/radeon: don't use ttm bo->offset (a0e4a298) · Commits · 戴 / test

drivers/gpu/drm/radeon/radeon.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -2828,6 +2828,7 @@ extern void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size
		extern void radeon_program_register_sequence(struct radeon_device *rdev,
		const u32 *registers,
		const u32 array_size);
		struct radeon_device radeon_get_rdev(struct ttm_bo_device bdev);

		/*
		* vm

+15 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,21 @@ static inline void radeon_bo_unreserve(struct radeon_bo *bo)
		*/
		static inline u64 radeon_bo_gpu_offset(struct radeon_bo *bo)
		{
		return bo->tbo.offset;
		struct radeon_device *rdev;
		u64 start = 0;

		rdev = radeon_get_rdev(bo->tbo.bdev);

		switch (bo->tbo.mem.mem_type) {
		case TTM_PL_TT:
		start = rdev->mc.gtt_start;
		break;
		case TTM_PL_VRAM:
		start = rdev->mc.vram_start;
		break;
		}

		return (bo->tbo.mem.start << PAGE_SHIFT) + start;
		}

		static inline unsigned long radeon_bo_size(struct radeon_bo *bo)

+1 −3

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@
		static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
		static void radeon_ttm_debugfs_fini(struct radeon_device *rdev);

		static struct radeon_device radeon_get_rdev(struct ttm_bo_device bdev)
		struct radeon_device radeon_get_rdev(struct ttm_bo_device bdev)
		{
		struct radeon_mman *mman;
		struct radeon_device *rdev;
		@@ -82,7 +82,6 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
		break;
		case TTM_PL_TT:
		man->func = &ttm_bo_manager_func;
		man->gpu_offset = rdev->mc.gtt_start;
		man->available_caching = TTM_PL_MASK_CACHING;
		man->default_caching = TTM_PL_FLAG_CACHED;
		man->flags = TTM_MEMTYPE_FLAG_MAPPABLE \| TTM_MEMTYPE_FLAG_CMA;
		@@ -104,7 +103,6 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
		case TTM_PL_VRAM:
		/* "On-card" video ram */
		man->func = &ttm_bo_manager_func;
		man->gpu_offset = rdev->mc.vram_start;
		man->flags = TTM_MEMTYPE_FLAG_FIXED \|
		TTM_MEMTYPE_FLAG_MAPPABLE;
		man->available_caching = TTM_PL_FLAG_UNCACHED \| TTM_PL_FLAG_WC;