mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	drm/xe: Ensure mutex are destroyed
Add missing mutex_destroy calls to fini functions or convert to drmm_mutex_init where fini function is not available. Cc: Matthew Brost <matthew.brost@intel.com> Signed-off-by: Bommithi Sakeena <bommithi.sakeena@intel.com> Reviewed-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
		
							parent
							
								
									5349bb76d6
								
							
						
					
					
						commit
						28b1d9155c
					
				
					 4 changed files with 6 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -137,7 +137,7 @@ int xe_guc_ct_init(struct xe_guc_ct *ct)
 | 
			
		|||
 | 
			
		||||
	xe_assert(xe, !(guc_ct_size() % PAGE_SIZE));
 | 
			
		||||
 | 
			
		||||
	mutex_init(&ct->lock);
 | 
			
		||||
	drmm_mutex_init(&xe->drm, &ct->lock);
 | 
			
		||||
	spin_lock_init(&ct->fast_lock);
 | 
			
		||||
	xa_init(&ct->fence_lookup);
 | 
			
		||||
	INIT_WORK(&ct->g2h_worker, g2h_worker_func);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -890,6 +890,7 @@ void xe_guc_pc_fini(struct xe_guc_pc *pc)
 | 
			
		|||
	XE_WARN_ON(xe_guc_pc_stop(pc));
 | 
			
		||||
	sysfs_remove_files(pc_to_gt(pc)->sysfs, pc_attrs);
 | 
			
		||||
	xe_bo_unpin_map_no_vm(pc->bo);
 | 
			
		||||
	mutex_destroy(&pc->freq_lock);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -195,6 +195,7 @@ static void guc_submit_fini(struct drm_device *drm, void *arg)
 | 
			
		|||
	xa_destroy(&guc->submission_state.exec_queue_lookup);
 | 
			
		||||
	ida_destroy(&guc->submission_state.guc_ids);
 | 
			
		||||
	bitmap_free(guc->submission_state.guc_ids_bitmap);
 | 
			
		||||
	mutex_destroy(&guc->submission_state.lock);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define GUC_ID_MAX		65535
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,6 +8,8 @@
 | 
			
		|||
#include <linux/delay.h>
 | 
			
		||||
#include <linux/errno.h>
 | 
			
		||||
 | 
			
		||||
#include <drm/drm_managed.h>
 | 
			
		||||
 | 
			
		||||
#include "xe_gt.h"
 | 
			
		||||
#include "xe_mmio.h"
 | 
			
		||||
#include "xe_pcode_api.h"
 | 
			
		||||
| 
						 | 
				
			
			@ -276,7 +278,7 @@ int xe_pcode_init(struct xe_gt *gt)
 | 
			
		|||
 */
 | 
			
		||||
int xe_pcode_probe(struct xe_gt *gt)
 | 
			
		||||
{
 | 
			
		||||
	mutex_init(>->pcode.lock);
 | 
			
		||||
	drmm_mutex_init(>_to_xe(gt)->drm, >->pcode.lock);
 | 
			
		||||
 | 
			
		||||
	if (!IS_DGFX(gt_to_xe(gt)))
 | 
			
		||||
		return 0;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue