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

Commit 857d913d authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: be explicit about cpu vram access for driver BOs (v2) 



For kernel driver BOs, be explicit about whether we need
vram access up front.  This avoids unecessary migrations and
avoids using visible vram for buffers were it's not needed.

v2: line wrap fixes

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

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

+2 −1
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ static int amdgpu_vram_scratch_init(struct amdgpu_device *adev) 


	if (adev->vram_scratch.robj == NULL) {

		r = amdgpu_bo_create(adev, AMDGPU_GPU_PAGE_SIZE,

				     PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM, 0,

				     PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				     NULL, &adev->vram_scratch.robj);

		if (r) {

			return r;

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

+2 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, 
	aligned_size = ALIGN(size, PAGE_SIZE);

	ret = amdgpu_gem_object_create(adev, aligned_size, 0,

				       AMDGPU_GEM_DOMAIN_VRAM,

				       0, true,

				       &gobj);

				       AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				       true, &gobj);

	if (ret) {

		printk(KERN_ERR "failed to allocate framebuffer (%d)\n",

		       aligned_size);

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

+2 −1
Original line number Diff line number Diff line
@@ -125,7 +125,8 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) 


	if (adev->gart.robj == NULL) {

		r = amdgpu_bo_create(adev, adev->gart.table_size,

				     PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM, 0,

				     PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				     NULL, &adev->gart.robj);

		if (r) {

			return r;

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

+2 −1
Original line number Diff line number Diff line
@@ -656,7 +656,8 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv, 


	r = amdgpu_gem_object_create(adev, args->size, 0,

				     AMDGPU_GEM_DOMAIN_VRAM,

				     0, ttm_bo_type_device,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				     ttm_bo_type_device,

				     &gobj);

	if (r)

		return -ENOMEM;

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

+2 −1
Original line number Diff line number Diff line
@@ -859,7 +859,8 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
	amdgpu_ttm_set_active_vram_size(adev, adev->mc.visible_vram_size);



	r = amdgpu_bo_create(adev, 256 * 1024, PAGE_SIZE, true,

			     AMDGPU_GEM_DOMAIN_VRAM, 0,

			     AMDGPU_GEM_DOMAIN_VRAM,

			     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

			     NULL, &adev->stollen_vga_memory);

	if (r) {

		return r;