Commit 3d0c4a62 authored by Umesh Nerlige Ramappa's avatar Umesh Nerlige Ramappa Committed by Lucas De Marchi
Browse files

drm/xe: Move part of xe_file cleanup to a helper 



In order to make xe_file ref counted, move destruction of xe_file
members to a helper.

v2: Move xe_vm_close_and_put back into xe_file_close (Matt)

Signed-off-by: default avatarUmesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240718210548.3580382-2-umesh.nerlige.ramappa@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 7108b4a5

drivers/gpu/drm/xe/xe_device.c

+18 −11
Original line number Diff line number Diff line
@@ -93,9 +93,25 @@ static int xe_file_open(struct drm_device *dev, struct drm_file *file) 
	return 0;

}



static void xe_file_destroy(struct xe_file *xef)

{

	struct xe_device *xe = xef->xe;



	xa_destroy(&xef->exec_queue.xa);

	mutex_destroy(&xef->exec_queue.lock);

	xa_destroy(&xef->vm.xa);

	mutex_destroy(&xef->vm.lock);



	spin_lock(&xe->clients.lock);

	xe->clients.count--;

	spin_unlock(&xe->clients.lock);



	xe_drm_client_put(xef->client);

	kfree(xef);

}



static void xe_file_close(struct drm_device *dev, struct drm_file *file)

{

	struct xe_device *xe = to_xe_device(dev);

	struct xe_file *xef = file->driver_priv;

	struct xe_vm *vm;

	struct xe_exec_queue *q;
@@ -111,21 +127,12 @@ static void xe_file_close(struct drm_device *dev, struct drm_file *file) 
		xe_exec_queue_kill(q);

		xe_exec_queue_put(q);

	}

	xa_destroy(&xef->exec_queue.xa);

	mutex_destroy(&xef->exec_queue.lock);

	mutex_lock(&xef->vm.lock);

	xa_for_each(&xef->vm.xa, idx, vm)

		xe_vm_close_and_put(vm);

	mutex_unlock(&xef->vm.lock);

	xa_destroy(&xef->vm.xa);

	mutex_destroy(&xef->vm.lock);



	spin_lock(&xe->clients.lock);

	xe->clients.count--;

	spin_unlock(&xe->clients.lock);



	xe_drm_client_put(xef->client);

	kfree(xef);

	xe_file_destroy(xef);

}



static const struct drm_ioctl_desc xe_ioctls[] = {