Commit 3b85b7bc authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/xe: Fix display runtime_pm handling 



i915's intel_runtime_pm_get_if_in_use actually calls the
pm_runtime_get_if_active() with ign_usage_count = false, but Xe
was erroneously calling it with true because of the mem_access cases.

This can lead to unnecessary references getting hold here and device
never getting into the runtime suspended state.

Let's use directly the 'if_in_use' function provided by linux/pm_runtime.

Also, already start this new function protected from the runtime
recursion, since runtime_pm will need to call for display functions
for a proper D3Cold flow.

v2: Update commit message based on Matt's feedback.
    Fix return condition of pm_runtime_get_if_in_use (Matt)

Cc: Anshuman Gupta <anshuman.gupta@intel.com>
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-1-rodrigo.vivi@intel.com


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

drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static inline intel_wakeref_t intel_runtime_pm_get_if_in_use(struct xe_runtime_p 
{

	struct xe_device *xe = container_of(pm, struct xe_device, runtime_pm);



	return xe_pm_runtime_get_if_active(xe);

	return xe_pm_runtime_get_if_in_use(xe);

}



static inline void intel_runtime_pm_put_unchecked(struct xe_runtime_pm *pm)

drivers/gpu/drm/xe/xe_pm.c

+17 −0
Original line number Diff line number Diff line
@@ -457,6 +457,23 @@ int xe_pm_runtime_get_if_active(struct xe_device *xe) 
	return pm_runtime_get_if_active(xe->drm.dev, true);

}



/**

 * xe_pm_runtime_get_if_in_use - Get a runtime_pm reference and resume if needed

 * @xe: xe device instance

 *

 * Returns: True if device is awake and the reference was taken, false otherwise.

 */

bool xe_pm_runtime_get_if_in_use(struct xe_device *xe)

{

	if (xe_pm_read_callback_task(xe) == current) {

		/* The device is awake, grab the ref and move on */

		pm_runtime_get_noresume(xe->drm.dev);

		return true;

	}



	return pm_runtime_get_if_in_use(xe->drm.dev) > 0;

}



/**

 * xe_pm_assert_unbounded_bridge - Disable PM on unbounded pcie parent bridge

 * @xe: xe device instance

drivers/gpu/drm/xe/xe_pm.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ int 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);

int xe_pm_runtime_get_if_active(struct xe_device *xe);

bool xe_pm_runtime_get_if_in_use(struct xe_device *xe);

void xe_pm_assert_unbounded_bridge(struct xe_device *xe);

int xe_pm_set_vram_threshold(struct xe_device *xe, u32 threshold);

void xe_pm_d3cold_allowed_toggle(struct xe_device *xe);