On Fri, Oct 19, 2018 at 12:27:52AM +0800, Thomas Zimmermann wrote:
> Unified initialization and release of the global TTM state is provided
> by struct ttm_global and its interfaces.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
Reviewed-by: Huang Rui <ray.huang@xxxxxxx>
> ---
> drivers/gpu/drm/radeon/radeon.h | 4 +--
> drivers/gpu/drm/radeon/radeon_ttm.c | 40 ++++-------------------------
> 2 files changed, 7 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
> index 1a6f6edb3515..554c0421b779 100644
> --- a/drivers/gpu/drm/radeon/radeon.h
> +++ b/drivers/gpu/drm/radeon/radeon.h
> @@ -73,6 +73,7 @@
> #include <drm/ttm/ttm_placement.h>
> #include <drm/ttm/ttm_module.h>
> #include <drm/ttm/ttm_execbuf_util.h>
> +#include <drm/ttm/ttm_global.h>
>
> #include <drm/drm_gem.h>
>
> @@ -448,8 +449,7 @@ struct radeon_surface_reg {
> * TTM.
> */
> struct radeon_mman {
> - struct ttm_bo_global_ref bo_global_ref;
> - struct drm_global_reference mem_global_ref;
> + struct ttm_global glob;
> struct ttm_bo_device bdev;
> bool mem_global_referenced;
> bool initialized;
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index dac4ec5a120b..363860e82892 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -64,45 +64,16 @@ static struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
> /*
> * Global memory.
> */
> -static int radeon_ttm_mem_global_init(struct drm_global_reference *ref)
> -{
> - return ttm_mem_global_init(ref->object);
> -}
> -
> -static void radeon_ttm_mem_global_release(struct drm_global_reference *ref)
> -{
> - ttm_mem_global_release(ref->object);
> -}
>
> static int radeon_ttm_global_init(struct radeon_device *rdev)
> {
> - struct drm_global_reference *global_ref;
> int r;
>
> rdev->mman.mem_global_referenced = false;
> - global_ref = &rdev->mman.mem_global_ref;
> - global_ref->global_type = DRM_GLOBAL_TTM_MEM;
> - global_ref->size = sizeof(struct ttm_mem_global);
> - global_ref->init = &radeon_ttm_mem_global_init;
> - global_ref->release = &radeon_ttm_mem_global_release;
> - r = drm_global_item_ref(global_ref);
> - if (r != 0) {
> - DRM_ERROR("Failed setting up TTM memory accounting "
> - "subsystem.\n");
> - return r;
> - }
>
> - rdev->mman.bo_global_ref.mem_glob =
> - rdev->mman.mem_global_ref.object;
> - global_ref = &rdev->mman.bo_global_ref.ref;
> - global_ref->global_type = DRM_GLOBAL_TTM_BO;
> - global_ref->size = sizeof(struct ttm_bo_global);
> - global_ref->init = &ttm_bo_global_ref_init;
> - global_ref->release = &ttm_bo_global_ref_release;
> - r = drm_global_item_ref(global_ref);
> - if (r != 0) {
> - DRM_ERROR("Failed setting up TTM BO subsystem.\n");
> - drm_global_item_unref(&rdev->mman.mem_global_ref);
> + r = ttm_global_init(&rdev->mman.glob);
> + if (r) {
> + DRM_ERROR("Failed setting up TTM subsystem.\n");
> return r;
> }
>
> @@ -113,8 +84,7 @@ static int radeon_ttm_global_init(struct radeon_device *rdev)
> static void radeon_ttm_global_fini(struct radeon_device *rdev)
> {
> if (rdev->mman.mem_global_referenced) {
> - drm_global_item_unref(&rdev->mman.bo_global_ref.ref);
> - drm_global_item_unref(&rdev->mman.mem_global_ref);
> + ttm_global_release(&rdev->mman.glob);
> rdev->mman.mem_global_referenced = false;
> }
> }
> @@ -853,7 +823,7 @@ int radeon_ttm_init(struct radeon_device *rdev)
> }
> /* No others user of address space so set it to 0 */
> r = ttm_bo_device_init(&rdev->mman.bdev,
> - rdev->mman.bo_global_ref.ref.object,
> + ttm_global_get_bo_global(&rdev->mman.glob),
> &radeon_bo_driver,
> rdev->ddev->anon_inode->i_mapping,
> DRM_FILE_PAGE_OFFSET,
> --
> 2.19.1
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
