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

Commit 1cd106ec authored by Felix Kuehling's avatar Felix Kuehling Committed by Oded Gabbay
Browse files

drm/amdkfd: Stop using GFP_NOIO explicitly 



This is no longer needed with the memalloc_nofs_save/restore in
dqm_lock/unlock.

Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent efeaed4d

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+2 −2
Original line number Diff line number Diff line
@@ -739,8 +739,8 @@ int kfd_gtt_sa_allocate(struct kfd_dev *kfd, unsigned int size, 
	if (size > kfd->gtt_sa_num_of_chunks * kfd->gtt_sa_chunk_size)

		return -ENOMEM;



	*mem_obj = kzalloc(sizeof(struct kfd_mem_obj), GFP_NOIO);

	if ((*mem_obj) == NULL)

	*mem_obj = kzalloc(sizeof(struct kfd_mem_obj), GFP_KERNEL);

	if (!(*mem_obj))

		return -ENOMEM;



	pr_debug("Allocated mem_obj = %p for size = %d\n", *mem_obj, size);

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type, 
	if (WARN_ON(type >= KFD_MQD_TYPE_MAX))

		return NULL;



	mqd = kzalloc(sizeof(*mqd), GFP_NOIO);

	mqd = kzalloc(sizeof(*mqd), GFP_KERNEL);

	if (!mqd)

		return NULL;

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static int init_mqd(struct mqd_manager *mm, void **mqd, 
	 * instead of sub-allocation function.

	 */

	if (kfd->cwsr_enabled && (q->type == KFD_QUEUE_TYPE_COMPUTE)) {

		*mqd_mem_obj = kzalloc(sizeof(struct kfd_mem_obj), GFP_NOIO);

		*mqd_mem_obj = kzalloc(sizeof(struct kfd_mem_obj), GFP_KERNEL);

		if (!*mqd_mem_obj)

			return -ENOMEM;

		retval = kfd->kfd2kgd->init_gtt_mem_allocation(kfd->kgd,
@@ -393,7 +393,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, 
	if (WARN_ON(type >= KFD_MQD_TYPE_MAX))

		return NULL;



	mqd = kzalloc(sizeof(*mqd), GFP_NOIO);

	mqd = kzalloc(sizeof(*mqd), GFP_KERNEL);

	if (!mqd)

		return NULL;

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type, 
	if (WARN_ON(type >= KFD_MQD_TYPE_MAX))

		return NULL;



	mqd = kzalloc(sizeof(*mqd), GFP_NOIO);

	mqd = kzalloc(sizeof(*mqd), GFP_KERNEL);

	if (!mqd)

		return NULL;