diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-08-04 12:56:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-08-06 13:12:40 +1000 |
| commit | a751612d4cb77779669da0a6d19fbc4f7e72ba6f (patch) | |
| tree | b076cce1fa4032414f774dbf21b6e6461e2aceb1 /include/drm | |
| parent | 7541ce1a6f2be9ab056a5b5105e08aef8d3287b1 (diff) | |
| download | linux-stable-a751612d4cb77779669da0a6d19fbc4f7e72ba6f.tar.gz linux-stable-a751612d4cb77779669da0a6d19fbc4f7e72ba6f.tar.bz2 linux-stable-a751612d4cb77779669da0a6d19fbc4f7e72ba6f.zip | |
drm/ttm: drop list of memory managers from device. (v2)
The driver now controls these, the core just controls the system
memory one.
v2: init sysman explicitly and assign it as a driver manager
to simplify the lookup sequence.
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-55-airlied@gmail.com
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index e17975466b7f..2cb8721398ee 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -414,7 +414,7 @@ struct ttm_bo_device { /* * access via ttm_manager_type. */ - struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES]; + struct ttm_mem_type_manager sysman; struct ttm_mem_type_manager *man_drv[TTM_NUM_MEM_TYPES]; /* * Protected by internal locks. @@ -446,9 +446,7 @@ struct ttm_bo_device { static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev, int mem_type) { - if (bdev->man_drv[mem_type]) - return bdev->man_drv[mem_type]; - return &bdev->man_priv[mem_type]; + return bdev->man_drv[mem_type]; } static inline void ttm_set_driver_manager(struct ttm_bo_device *bdev, |