Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ea863fd authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: keep the prefered/allowed domains in the BO 



Stop copying that to the bo list entry, it doesn't change anyway.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 636ce25c

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −3
Original line number Diff line number Diff line
@@ -484,8 +484,6 @@ struct amdgpu_bo_list_entry { 
	struct amdgpu_bo		*robj;

	struct ttm_validate_buffer	tv;

	struct amdgpu_bo_va		*bo_va;

	unsigned			prefered_domains;

	unsigned			allowed_domains;

	uint32_t			priority;

};
@@ -522,7 +520,8 @@ struct amdgpu_bo { 
	/* Protected by gem.mutex */

	struct list_head		list;

	/* Protected by tbo.reserved */

	u32				initial_domain;

	u32				prefered_domains;

	u32				allowed_domains;

	struct ttm_place		placements[AMDGPU_GEM_DOMAIN_MAX + 1];

	struct ttm_placement		placement;

	struct ttm_buffer_object	tbo;

drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c

+4 −11
Original line number Diff line number Diff line
@@ -111,23 +111,16 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, 
		drm_gem_object_unreference_unlocked(gobj);

		entry->priority = min(info[i].bo_priority,

				      AMDGPU_BO_LIST_MAX_PRIORITY);

		entry->prefered_domains = entry->robj->initial_domain;

		entry->allowed_domains = entry->prefered_domains;

		if (entry->allowed_domains == AMDGPU_GEM_DOMAIN_VRAM)

			entry->allowed_domains |= AMDGPU_GEM_DOMAIN_GTT;

		if (amdgpu_ttm_tt_has_userptr(entry->robj->tbo.ttm)) {

		if (amdgpu_ttm_tt_has_userptr(entry->robj->tbo.ttm))

			has_userptr = true;

			entry->prefered_domains = AMDGPU_GEM_DOMAIN_GTT;

			entry->allowed_domains = AMDGPU_GEM_DOMAIN_GTT;

		}

		entry->tv.bo = &entry->robj->tbo;

		entry->tv.shared = true;



		if (entry->prefered_domains == AMDGPU_GEM_DOMAIN_GDS)

		if (entry->robj->prefered_domains == AMDGPU_GEM_DOMAIN_GDS)

			gds_obj = entry->robj;

		if (entry->prefered_domains == AMDGPU_GEM_DOMAIN_GWS)

		if (entry->robj->prefered_domains == AMDGPU_GEM_DOMAIN_GWS)

			gws_obj = entry->robj;

		if (entry->prefered_domains == AMDGPU_GEM_DOMAIN_OA)

		if (entry->robj->prefered_domains == AMDGPU_GEM_DOMAIN_OA)

			oa_obj = entry->robj;



		trace_amdgpu_bo_list_set(list, entry->robj);

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+4 −6
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, 
	}



	p->uf_entry.robj = amdgpu_bo_ref(p->uf.bo);

	p->uf_entry.prefered_domains = AMDGPU_GEM_DOMAIN_GTT;

	p->uf_entry.allowed_domains = AMDGPU_GEM_DOMAIN_GTT;

	p->uf_entry.priority = 0;

	p->uf_entry.tv.bo = &p->uf_entry.robj->tbo;

	p->uf_entry.tv.shared = true;
@@ -315,9 +313,9 @@ int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, 
		 * completely.

		 */

		if (p->bytes_moved <= p->bytes_moved_threshold)

			domain = lobj->prefered_domains;

			domain = bo->prefered_domains;

		else

			domain = lobj->allowed_domains;

			domain = bo->allowed_domains;



	retry:

		amdgpu_ttm_placement_from_domain(bo, domain);
@@ -327,8 +325,8 @@ int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, 
			       initial_bytes_moved;



		if (unlikely(r)) {

			if (r != -ERESTARTSYS && domain != lobj->allowed_domains) {

				domain = lobj->allowed_domains;

			if (r != -ERESTARTSYS && domain != bo->allowed_domains) {

				domain = bo->allowed_domains;

				goto retry;

			}

			return r;

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+10 −4
Original line number Diff line number Diff line
@@ -252,6 +252,8 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, 
		goto handle_lockup;



	bo = gem_to_amdgpu_bo(gobj);

	bo->prefered_domains = AMDGPU_GEM_DOMAIN_GTT;

	bo->allowed_domains = AMDGPU_GEM_DOMAIN_GTT;

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

	if (r)

		goto release_object;
@@ -628,7 +630,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, 


		info.bo_size = robj->gem_base.size;

		info.alignment = robj->tbo.mem.page_alignment << PAGE_SHIFT;

		info.domains = robj->initial_domain;

		info.domains = robj->prefered_domains;

		info.domain_flags = robj->flags;

		amdgpu_bo_unreserve(robj);

		if (copy_to_user(out, &info, sizeof(info)))
@@ -641,9 +643,13 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, 
			amdgpu_bo_unreserve(robj);

			break;

		}

		robj->initial_domain = args->value & (AMDGPU_GEM_DOMAIN_VRAM |

		robj->prefered_domains = args->value & (AMDGPU_GEM_DOMAIN_VRAM |

							AMDGPU_GEM_DOMAIN_GTT |

							AMDGPU_GEM_DOMAIN_CPU);

		robj->allowed_domains = robj->prefered_domains;

		if (robj->allowed_domains == AMDGPU_GEM_DOMAIN_VRAM)

			robj->allowed_domains |= AMDGPU_GEM_DOMAIN_GTT;



		amdgpu_bo_unreserve(robj);

		break;

	default:

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+9 −6
Original line number Diff line number Diff line
@@ -254,12 +254,15 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev, 
	bo->adev = adev;

	INIT_LIST_HEAD(&bo->list);

	INIT_LIST_HEAD(&bo->va);

	bo->initial_domain = domain & (AMDGPU_GEM_DOMAIN_VRAM |

	bo->prefered_domains = domain & (AMDGPU_GEM_DOMAIN_VRAM |

					 AMDGPU_GEM_DOMAIN_GTT |

					 AMDGPU_GEM_DOMAIN_CPU |

					 AMDGPU_GEM_DOMAIN_GDS |

					 AMDGPU_GEM_DOMAIN_GWS |

					 AMDGPU_GEM_DOMAIN_OA);

	bo->allowed_domains = bo->prefered_domains;

	if (!kernel && bo->allowed_domains == AMDGPU_GEM_DOMAIN_VRAM)

		bo->allowed_domains |= AMDGPU_GEM_DOMAIN_GTT;



	bo->flags = flags;