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

Commit 6ac7defb authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup GWS, GDS and OA allocation 



Those are certainly not kernel allocations, instead set the NO_CPU_ACCESS flag.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 34d7be5d

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

+7 −8
Original line number Diff line number Diff line
@@ -186,14 +186,14 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
{

	struct amdgpu_device *adev = dev->dev_private;

	union drm_amdgpu_gem_create *args = data;

	uint64_t flags = args->in.domain_flags;

	uint64_t size = args->in.bo_size;

	struct drm_gem_object *gobj;

	uint32_t handle;

	bool kernel = false;

	int r;



	/* reject invalid gem flags */

	if (args->in.domain_flags & ~(AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |

	if (flags & ~(AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |

		      AMDGPU_GEM_CREATE_NO_CPU_ACCESS |

		      AMDGPU_GEM_CREATE_CPU_GTT_USWC |

		      AMDGPU_GEM_CREATE_VRAM_CLEARED))
@@ -211,7 +211,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
	/* create a gem object to contain this object in */

	if (args->in.domains & (AMDGPU_GEM_DOMAIN_GDS |

	    AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA)) {

		kernel = true;

		flags |= AMDGPU_GEM_CREATE_NO_CPU_ACCESS;

		if (args->in.domains == AMDGPU_GEM_DOMAIN_GDS)

			size = size << AMDGPU_GDS_SHIFT;

		else if (args->in.domains == AMDGPU_GEM_DOMAIN_GWS)
@@ -225,8 +225,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),

				     args->in.domain_flags,

				     kernel, &gobj);

				     flags, false, &gobj);

	if (r)

		return r;