Commit a68bb193 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/radeon/ttm: move to driver binding/destroy functions. (v2) 



Do agp decision in the driver, instead of special binding funcs

v2: use container_of, drop some {}.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200907204630.1406528-6-airlied@gmail.com
parent 738edc0a

drivers/gpu/drm/radeon/radeon.h

+4 −3
Original line number Diff line number Diff line
@@ -2815,10 +2815,11 @@ extern void radeon_legacy_set_clock_gating(struct radeon_device *rdev, int enabl 
extern void radeon_atom_set_clock_gating(struct radeon_device *rdev, int enable);

extern void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain);

extern bool radeon_ttm_bo_is_radeon_bo(struct ttm_buffer_object *bo);

extern int radeon_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr,

extern int radeon_ttm_tt_set_userptr(struct radeon_device *rdev,

				     struct ttm_tt *ttm, uint64_t addr,

				     uint32_t flags);

extern bool radeon_ttm_tt_has_userptr(struct ttm_tt *ttm);

extern bool radeon_ttm_tt_is_readonly(struct ttm_tt *ttm);

extern bool radeon_ttm_tt_has_userptr(struct radeon_device *rdev, struct ttm_tt *ttm);

extern bool radeon_ttm_tt_is_readonly(struct radeon_device *rdev, struct ttm_tt *ttm);

extern void radeon_vram_location(struct radeon_device *rdev, struct radeon_mc *mc, u64 base);

extern void radeon_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc);

extern int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon);

drivers/gpu/drm/radeon/radeon_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) 
			p->relocs[i].allowed_domains = domain;

		}



		if (radeon_ttm_tt_has_userptr(p->relocs[i].robj->tbo.ttm)) {

		if (radeon_ttm_tt_has_userptr(p->rdev, p->relocs[i].robj->tbo.ttm)) {

			uint32_t domain = p->relocs[i].preferred_domains;

			if (!(domain & RADEON_GEM_DOMAIN_GTT)) {

				DRM_ERROR("Only RADEON_GEM_DOMAIN_GTT is "

drivers/gpu/drm/radeon/radeon_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ int radeon_gem_userptr_ioctl(struct drm_device *dev, void *data, 
		goto handle_lockup;



	bo = gem_to_radeon_bo(gobj);

	r = radeon_ttm_tt_set_userptr(bo->tbo.ttm, args->addr, args->flags);

	r = radeon_ttm_tt_set_userptr(rdev, bo->tbo.ttm, args->addr, args->flags);

	if (r)

		goto release_object;
@@ -420,7 +420,7 @@ int radeon_mode_dumb_mmap(struct drm_file *filp, 
		return -ENOENT;

	}

	robj = gem_to_radeon_bo(gobj);

	if (radeon_ttm_tt_has_userptr(robj->tbo.ttm)) {

	if (radeon_ttm_tt_has_userptr(robj->rdev, robj->tbo.ttm)) {

		drm_gem_object_put(gobj);

		return -EPERM;

	}
@@ -721,7 +721,7 @@ int radeon_gem_op_ioctl(struct drm_device *dev, void *data, 
	robj = gem_to_radeon_bo(gobj);



	r = -EPERM;

	if (radeon_ttm_tt_has_userptr(robj->tbo.ttm))

	if (radeon_ttm_tt_has_userptr(robj->rdev, robj->tbo.ttm))

		goto out;



	r = radeon_bo_reserve(robj, false);

drivers/gpu/drm/radeon/radeon_object.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain, u64 max_offset, 
	struct ttm_operation_ctx ctx = { false, false };

	int r, i;



	if (radeon_ttm_tt_has_userptr(bo->tbo.ttm))

	if (radeon_ttm_tt_has_userptr(bo->rdev, bo->tbo.ttm))

		return -EPERM;



	if (bo->pin_count) {

drivers/gpu/drm/radeon/radeon_prime.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj, 
					int flags)

{

	struct radeon_bo *bo = gem_to_radeon_bo(gobj);

	if (radeon_ttm_tt_has_userptr(bo->tbo.ttm))

	if (radeon_ttm_tt_has_userptr(bo->rdev, bo->tbo.ttm))

		return ERR_PTR(-EPERM);

	return drm_gem_prime_export(gobj, flags);

}