Commit 5c9da9fc authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/xe: Convert xe_pm_runtime_{get, put} to void and protect from recursion 



With mem_access going away and pm_runtime getting called instead,
we need to protect these against recursions.

The put is asynchronous so there's no need to block it. However, for a
proper balance, we need to ensure that the references are taken and
restored regardless of the flow. So, let's convert them all to void and
use some direct linux/pm_runtime functions.

v2: Rebased and update commit message (Matt).

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


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

drivers/gpu/drm/xe/xe_pm.c

+14 −11
Original line number Diff line number Diff line
@@ -408,26 +408,29 @@ int xe_pm_runtime_resume(struct xe_device *xe) 
/**

 * xe_pm_runtime_get - Get a runtime_pm reference and resume synchronously

 * @xe: xe device instance

 *

 * Returns: Any number greater than or equal to 0 for success, negative error

 * code otherwise.

 */

int xe_pm_runtime_get(struct xe_device *xe)

void xe_pm_runtime_get(struct xe_device *xe)

{

	return pm_runtime_get_sync(xe->drm.dev);

	pm_runtime_get_noresume(xe->drm.dev);



	if (xe_pm_read_callback_task(xe) == current)

		return;



	pm_runtime_resume(xe->drm.dev);

}



/**

 * xe_pm_runtime_put - Put the runtime_pm reference back and mark as idle

 * @xe: xe device instance

 *

 * Returns: Any number greater than or equal to 0 for success, negative error

 * code otherwise.

 */

int xe_pm_runtime_put(struct xe_device *xe)

void xe_pm_runtime_put(struct xe_device *xe)

{

	if (xe_pm_read_callback_task(xe) == current) {

		pm_runtime_put_noidle(xe->drm.dev);

	} else {

		pm_runtime_mark_last_busy(xe->drm.dev);

	return pm_runtime_put(xe->drm.dev);

		pm_runtime_put(xe->drm.dev);

	}

}



/**

drivers/gpu/drm/xe/xe_pm.h

+2 −2
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ void xe_pm_runtime_fini(struct xe_device *xe); 
bool xe_pm_runtime_suspended(struct xe_device *xe);

int xe_pm_runtime_suspend(struct xe_device *xe);

int xe_pm_runtime_resume(struct xe_device *xe);

int xe_pm_runtime_get(struct xe_device *xe);

void xe_pm_runtime_get(struct xe_device *xe);

int xe_pm_runtime_get_ioctl(struct xe_device *xe);

int xe_pm_runtime_put(struct xe_device *xe);

void xe_pm_runtime_put(struct xe_device *xe);

int xe_pm_runtime_get_if_active(struct xe_device *xe);

bool xe_pm_runtime_get_if_in_use(struct xe_device *xe);

bool xe_pm_runtime_resume_and_get(struct xe_device *xe);