Commit fc026c8b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2021-11-24' of... 

Merge tag 'drm-intel-fixes-2021-11-24' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

Fix wakeref handling of PXP suspend.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YZ65bsPOK+6JLv0d@intel.com
parents 7798a736 b8d84368

drivers/gpu/drm/i915/gt/intel_gt_pm.c

+4 −3
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ void intel_gt_suspend_prepare(struct intel_gt *gt) 
	user_forcewake(gt, true);

	wait_for_suspend(gt);



	intel_pxp_suspend(&gt->pxp, false);

	intel_pxp_suspend_prepare(&gt->pxp);

}



static suspend_state_t pm_suspend_target(void)
@@ -326,6 +326,7 @@ void intel_gt_suspend_late(struct intel_gt *gt) 
	GEM_BUG_ON(gt->awake);



	intel_uc_suspend(&gt->uc);

	intel_pxp_suspend(&gt->pxp);



	/*

	 * On disabling the device, we want to turn off HW access to memory
@@ -353,7 +354,7 @@ void intel_gt_suspend_late(struct intel_gt *gt) 


void intel_gt_runtime_suspend(struct intel_gt *gt)

{

	intel_pxp_suspend(&gt->pxp, true);

	intel_pxp_runtime_suspend(&gt->pxp);

	intel_uc_runtime_suspend(&gt->uc);



	GT_TRACE(gt, "\n");
@@ -371,7 +372,7 @@ int intel_gt_runtime_resume(struct intel_gt *gt) 
	if (ret)

		return ret;



	intel_pxp_resume(&gt->pxp);

	intel_pxp_runtime_resume(&gt->pxp);



	return 0;

}

drivers/gpu/drm/i915/pxp/intel_pxp_pm.c

+26 −11
Original line number Diff line number Diff line
@@ -7,27 +7,30 @@ 
#include "intel_pxp_irq.h"

#include "intel_pxp_pm.h"

#include "intel_pxp_session.h"

#include "i915_drv.h"



void intel_pxp_suspend(struct intel_pxp *pxp, bool runtime)

void intel_pxp_suspend_prepare(struct intel_pxp *pxp)

{

	if (!intel_pxp_is_enabled(pxp))

		return;



	pxp->arb_is_valid = false;



	/*

	 * Contexts using protected objects keep a runtime PM reference, so we

	 * can only runtime suspend when all of them have been either closed

	 * or banned. Therefore, there is no need to invalidate in that

	 * scenario.

	 */

	if (!runtime)

	intel_pxp_invalidate(pxp);

}



	intel_pxp_fini_hw(pxp);

void intel_pxp_suspend(struct intel_pxp *pxp)

{

	intel_wakeref_t wakeref;



	if (!intel_pxp_is_enabled(pxp))

		return;



	with_intel_runtime_pm(&pxp_to_gt(pxp)->i915->runtime_pm, wakeref) {

		intel_pxp_fini_hw(pxp);

		pxp->hw_state_invalidated = false;

	}

}



void intel_pxp_resume(struct intel_pxp *pxp)

{
@@ -44,3 +47,15 @@ void intel_pxp_resume(struct intel_pxp *pxp) 


	intel_pxp_init_hw(pxp);

}



void intel_pxp_runtime_suspend(struct intel_pxp *pxp)

{

	if (!intel_pxp_is_enabled(pxp))

		return;



	pxp->arb_is_valid = false;



	intel_pxp_fini_hw(pxp);



	pxp->hw_state_invalidated = false;

}

drivers/gpu/drm/i915/pxp/intel_pxp_pm.h

+16 −3
Original line number Diff line number Diff line
@@ -9,16 +9,29 @@ 
#include "intel_pxp_types.h"



#ifdef CONFIG_DRM_I915_PXP

void intel_pxp_suspend(struct intel_pxp *pxp, bool runtime);

void intel_pxp_suspend_prepare(struct intel_pxp *pxp);

void intel_pxp_suspend(struct intel_pxp *pxp);

void intel_pxp_resume(struct intel_pxp *pxp);

void intel_pxp_runtime_suspend(struct intel_pxp *pxp);

#else

static inline void intel_pxp_suspend(struct intel_pxp *pxp, bool runtime)

static inline void intel_pxp_suspend_prepare(struct intel_pxp *pxp)

{

}



static inline void intel_pxp_suspend(struct intel_pxp *pxp)

{

}



static inline void intel_pxp_resume(struct intel_pxp *pxp)

{

}

#endif



static inline void intel_pxp_runtime_suspend(struct intel_pxp *pxp)

{

}

#endif

static inline void intel_pxp_runtime_resume(struct intel_pxp *pxp)

{

	intel_pxp_resume(pxp);

}

#endif /* __INTEL_PXP_PM_H__ */