Commit 48efa57e authored by Dave Airlie's avatar Dave Airlie

drm/ttm/agp: remove bdev from agp helpers

Since the agp bind/unbind/destroy are now getting called from drivers
rather than via the func table, drop the bdev parameter.
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200907204630.1406528-13-airlied@gmail.com
parent 43482554
...@@ -676,7 +676,7 @@ nouveau_ttm_tt_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm, ...@@ -676,7 +676,7 @@ nouveau_ttm_tt_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm,
struct nouveau_drm *drm = nouveau_bdev(bdev); struct nouveau_drm *drm = nouveau_bdev(bdev);
if (drm->agp.bridge) if (drm->agp.bridge)
return ttm_agp_bind(bdev, ttm, reg); return ttm_agp_bind(ttm, reg);
#endif #endif
return nouveau_sgdma_bind(bdev, ttm, reg); return nouveau_sgdma_bind(bdev, ttm, reg);
} }
...@@ -688,7 +688,7 @@ nouveau_ttm_tt_unbind(struct ttm_bo_device *bdev, struct ttm_tt *ttm) ...@@ -688,7 +688,7 @@ nouveau_ttm_tt_unbind(struct ttm_bo_device *bdev, struct ttm_tt *ttm)
struct nouveau_drm *drm = nouveau_bdev(bdev); struct nouveau_drm *drm = nouveau_bdev(bdev);
if (drm->agp.bridge) { if (drm->agp.bridge) {
ttm_agp_unbind(bdev, ttm); ttm_agp_unbind(ttm);
return; return;
} }
#endif #endif
...@@ -1318,7 +1318,7 @@ nouveau_ttm_tt_destroy(struct ttm_bo_device *bdev, ...@@ -1318,7 +1318,7 @@ nouveau_ttm_tt_destroy(struct ttm_bo_device *bdev,
#if IS_ENABLED(CONFIG_AGP) #if IS_ENABLED(CONFIG_AGP)
struct nouveau_drm *drm = nouveau_bdev(bdev); struct nouveau_drm *drm = nouveau_bdev(bdev);
if (drm->agp.bridge) { if (drm->agp.bridge) {
ttm_agp_destroy(bdev, ttm); ttm_agp_destroy(ttm);
return; return;
} }
#endif #endif
......
...@@ -693,7 +693,7 @@ static int radeon_ttm_tt_bind(struct ttm_bo_device *bdev, ...@@ -693,7 +693,7 @@ static int radeon_ttm_tt_bind(struct ttm_bo_device *bdev,
#if IS_ENABLED(CONFIG_AGP) #if IS_ENABLED(CONFIG_AGP)
if (rdev->flags & RADEON_IS_AGP) if (rdev->flags & RADEON_IS_AGP)
return ttm_agp_bind(bdev, ttm, bo_mem); return ttm_agp_bind(ttm, bo_mem);
#endif #endif
return radeon_ttm_backend_bind(bdev, ttm, bo_mem); return radeon_ttm_backend_bind(bdev, ttm, bo_mem);
...@@ -706,7 +706,7 @@ static void radeon_ttm_tt_unbind(struct ttm_bo_device *bdev, ...@@ -706,7 +706,7 @@ static void radeon_ttm_tt_unbind(struct ttm_bo_device *bdev,
struct radeon_device *rdev = radeon_get_rdev(bdev); struct radeon_device *rdev = radeon_get_rdev(bdev);
if (rdev->flags & RADEON_IS_AGP) { if (rdev->flags & RADEON_IS_AGP) {
ttm_agp_unbind(bdev, ttm); ttm_agp_unbind(ttm);
return; return;
} }
#endif #endif
...@@ -720,7 +720,7 @@ static void radeon_ttm_tt_destroy(struct ttm_bo_device *bdev, ...@@ -720,7 +720,7 @@ static void radeon_ttm_tt_destroy(struct ttm_bo_device *bdev,
struct radeon_device *rdev = radeon_get_rdev(bdev); struct radeon_device *rdev = radeon_get_rdev(bdev);
if (rdev->flags & RADEON_IS_AGP) { if (rdev->flags & RADEON_IS_AGP) {
ttm_agp_destroy(bdev, ttm); ttm_agp_destroy(ttm);
return; return;
} }
#endif #endif
......
...@@ -48,8 +48,7 @@ struct ttm_agp_backend { ...@@ -48,8 +48,7 @@ struct ttm_agp_backend {
struct agp_bridge_data *bridge; struct agp_bridge_data *bridge;
}; };
int ttm_agp_bind(struct ttm_bo_device *bdev, int ttm_agp_bind(struct ttm_tt *ttm, struct ttm_resource *bo_mem)
struct ttm_tt *ttm, struct ttm_resource *bo_mem)
{ {
struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm); struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);
struct page *dummy_read_page = ttm_bo_glob.dummy_read_page; struct page *dummy_read_page = ttm_bo_glob.dummy_read_page;
...@@ -84,8 +83,7 @@ int ttm_agp_bind(struct ttm_bo_device *bdev, ...@@ -84,8 +83,7 @@ int ttm_agp_bind(struct ttm_bo_device *bdev,
} }
EXPORT_SYMBOL(ttm_agp_bind); EXPORT_SYMBOL(ttm_agp_bind);
void ttm_agp_unbind(struct ttm_bo_device *bdev, void ttm_agp_unbind(struct ttm_tt *ttm)
struct ttm_tt *ttm)
{ {
struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm); struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);
...@@ -100,13 +98,12 @@ void ttm_agp_unbind(struct ttm_bo_device *bdev, ...@@ -100,13 +98,12 @@ void ttm_agp_unbind(struct ttm_bo_device *bdev,
} }
EXPORT_SYMBOL(ttm_agp_unbind); EXPORT_SYMBOL(ttm_agp_unbind);
void ttm_agp_destroy(struct ttm_bo_device *bdev, void ttm_agp_destroy(struct ttm_tt *ttm)
struct ttm_tt *ttm)
{ {
struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm); struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);
if (agp_be->mem) if (agp_be->mem)
ttm_agp_unbind(bdev, ttm); ttm_agp_unbind(ttm);
ttm_tt_fini(ttm); ttm_tt_fini(ttm);
kfree(agp_be); kfree(agp_be);
} }
......
...@@ -264,12 +264,9 @@ void ttm_tt_unpopulate(struct ttm_bo_device *bdev, struct ttm_tt *ttm); ...@@ -264,12 +264,9 @@ void ttm_tt_unpopulate(struct ttm_bo_device *bdev, struct ttm_tt *ttm);
struct ttm_tt *ttm_agp_tt_create(struct ttm_buffer_object *bo, struct ttm_tt *ttm_agp_tt_create(struct ttm_buffer_object *bo,
struct agp_bridge_data *bridge, struct agp_bridge_data *bridge,
uint32_t page_flags); uint32_t page_flags);
int ttm_agp_bind(struct ttm_bo_device *bdev, int ttm_agp_bind(struct ttm_tt *ttm, struct ttm_resource *bo_mem);
struct ttm_tt *ttm, struct ttm_resource *bo_mem); void ttm_agp_unbind(struct ttm_tt *ttm);
void ttm_agp_unbind(struct ttm_bo_device *bdev, void ttm_agp_destroy(struct ttm_tt *ttm);
struct ttm_tt *ttm);
void ttm_agp_destroy(struct ttm_bo_device *bdev,
struct ttm_tt *ttm);
#endif #endif
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment