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

Commit f8ddb39a authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amdgpu: fix the wrong type of gem object creation 



We still use legacy type of gem_object_create, it should update to ttm_bo_type
now.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent da5fd66c

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

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, 
				       AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |

				       AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS |

				       AMDGPU_GEM_CREATE_VRAM_CLEARED,

				       true, NULL, &gobj);

				       ttm_bo_type_kernel, NULL, &gobj);

	if (ret) {

		pr_err("failed to allocate framebuffer (%d)\n", aligned_size);

		return -ENOMEM;

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

+3 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 


	r = amdgpu_gem_object_create(adev, size, args->in.alignment,

				     (u32)(0xffffffff & args->in.domains),

				     flags, false, resv, &gobj);

				     flags, ttm_bo_type_device, resv, &gobj);

	if (flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID) {

		if (!r) {

			struct amdgpu_bo *abo = gem_to_amdgpu_bo(gobj);
@@ -317,7 +317,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, 


	/* create a gem object to contain this object in */

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

				     0, 0, NULL, &gobj);

				     0, ttm_bo_type_device, NULL, &gobj);

	if (r)

		return r;
@@ -766,7 +766,7 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv, 
				amdgpu_display_supported_domains(adev));

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

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				     false, NULL, &gobj);

				     ttm_bo_type_device, NULL, &gobj);

	if (r)

		return -ENOMEM;