Unverified Commit a3822910 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/xe: Removing extra mem_access protection from runtime pm 



This is not needed any longer, now that we have all the protection
in place with the runtime pm itself.

Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240417203952.25503-7-rodrigo.vivi@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent fdea94a4

drivers/gpu/drm/xe/xe_device.c

+0 −8
Original line number Diff line number Diff line
@@ -717,14 +717,6 @@ u32 xe_device_ccs_bytes(struct xe_device *xe, u64 size) 
		DIV_ROUND_UP_ULL(size, NUM_BYTES_PER_CCS_BYTE(xe)) : 0;

}



bool xe_device_mem_access_ongoing(struct xe_device *xe)

{

	if (xe_pm_read_callback_task(xe) != NULL)

		return true;



	return atomic_read(&xe->mem_access.ref);

}



/**

 * xe_device_assert_mem_access - Inspect the current runtime_pm state.

 * @xe: xe device instance

drivers/gpu/drm/xe/xe_device.h

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ bool xe_device_mem_access_get_if_ongoing(struct xe_device *xe); 
void xe_device_mem_access_put(struct xe_device *xe);



void xe_device_assert_mem_access(struct xe_device *xe);

bool xe_device_mem_access_ongoing(struct xe_device *xe);



static inline bool xe_device_in_fault_mode(struct xe_device *xe)

{

drivers/gpu/drm/xe/xe_pm.c

+0 −3
Original line number Diff line number Diff line
@@ -306,9 +306,6 @@ int xe_pm_runtime_suspend(struct xe_device *xe) 
	u8 id;

	int err = 0;



	if (xe->d3cold.allowed && xe_device_mem_access_ongoing(xe))

		return -EBUSY;



	/* Disable access_ongoing asserts and prevent recursive pm calls */

	xe_pm_write_callback_task(xe, current);