Commit fabedb75 authored by Vinay Belgaumkar's avatar Vinay Belgaumkar
Browse files

drm/xe: Add a wrapper for SLPC set/unset params 



Also, extract out the GuC RC related set/unset param functions
into xe_guc_rc file. GuC still allows us to override GuC RC mode
using an SLPC H2G interface. Continue to use that interface, but
move the related code to the newly created xe_guc_rc file.

Cc: Riana Tauro <riana.tauro@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarRiana Tauro <riana.tauro@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarVinay Belgaumkar <vinay.belgaumkar@intel.com>
Link: https://patch.msgid.link/20260204014234.2867763-4-vinay.belgaumkar@intel.com
parent a3f949cd

drivers/gpu/drm/xe/xe_guc_pc.c

+31 −25
Original line number Diff line number Diff line
@@ -264,6 +264,37 @@ static int pc_action_unset_param(struct xe_guc_pc *pc, u8 id) 
	return ret;

}



/**

 * xe_guc_pc_action_set_param() - Set value of SLPC param

 * @pc: Xe_GuC_PC instance

 * @id: Param id

 * @value: Value to set

 *

 * This function can be used to set any SLPC param.

 *

 * Return: 0 on Success

 */

int xe_guc_pc_action_set_param(struct xe_guc_pc *pc, u8 id, u32 value)

{

	xe_device_assert_mem_access(pc_to_xe(pc));

	return pc_action_set_param(pc, id, value);

}



/**

 * xe_guc_pc_action_unset_param() - Revert to default value

 * @pc: Xe_GuC_PC instance

 * @id: Param id

 *

 * This function can be used revert any SLPC param to its default value.

 *

 * Return: 0 on Success

 */

int xe_guc_pc_action_unset_param(struct xe_guc_pc *pc, u8 id)

{

	xe_device_assert_mem_access(pc_to_xe(pc));

	return pc_action_unset_param(pc, id);

}



static u32 decode_freq(u32 raw)

{

	return DIV_ROUND_CLOSEST(raw * GT_FREQUENCY_MULTIPLIER,
@@ -1045,31 +1076,6 @@ int xe_guc_pc_restore_stashed_freq(struct xe_guc_pc *pc) 
	return ret;

}



/**

 * xe_guc_pc_override_gucrc_mode - override GUCRC mode

 * @pc: Xe_GuC_PC instance

 * @mode: new value of the mode.

 *

 * Return: 0 on success, negative error code on error

 */

int xe_guc_pc_override_gucrc_mode(struct xe_guc_pc *pc, enum slpc_gucrc_mode mode)

{

	guard(xe_pm_runtime)(pc_to_xe(pc));

	return pc_action_set_param(pc, SLPC_PARAM_PWRGATE_RC_MODE, mode);

}



/**

 * xe_guc_pc_unset_gucrc_mode - unset GUCRC mode override

 * @pc: Xe_GuC_PC instance

 *

 * Return: 0 on success, negative error code on error

 */

int xe_guc_pc_unset_gucrc_mode(struct xe_guc_pc *pc)

{

	guard(xe_pm_runtime)(pc_to_xe(pc));

	return pc_action_unset_param(pc, SLPC_PARAM_PWRGATE_RC_MODE);

}



static void pc_init_pcode_freq(struct xe_guc_pc *pc)

{

	u32 min = DIV_ROUND_CLOSEST(pc->rpn_freq, GT_FREQUENCY_MULTIPLIER);

drivers/gpu/drm/xe/xe_guc_pc.h

+2 −3
Original line number Diff line number Diff line
@@ -9,15 +9,14 @@ 
#include <linux/types.h>



struct xe_guc_pc;

enum slpc_gucrc_mode;

struct drm_printer;



int xe_guc_pc_init(struct xe_guc_pc *pc);

int xe_guc_pc_start(struct xe_guc_pc *pc);

int xe_guc_pc_stop(struct xe_guc_pc *pc);

int xe_guc_pc_override_gucrc_mode(struct xe_guc_pc *pc, enum slpc_gucrc_mode mode);

int xe_guc_pc_unset_gucrc_mode(struct xe_guc_pc *pc);

void xe_guc_pc_print(struct xe_guc_pc *pc, struct drm_printer *p);

int xe_guc_pc_action_set_param(struct xe_guc_pc *pc, u8 id, u32 value);

int xe_guc_pc_action_unset_param(struct xe_guc_pc *pc, u8 id);



u32 xe_guc_pc_get_act_freq(struct xe_guc_pc *pc);

int xe_guc_pc_get_cur_freq(struct xe_guc_pc *pc, u32 *freq);

drivers/gpu/drm/xe/xe_guc_rc.c

+30 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "xe_gt_printk.h"

#include "xe_guc.h"

#include "xe_guc_ct.h"

#include "xe_guc_pc.h"

#include "xe_guc_rc.h"

#include "xe_pm.h"
@@ -128,3 +129,32 @@ int xe_guc_rc_enable(struct xe_guc *guc) 


	return guc_action_setup_gucrc(guc, GUCRC_FIRMWARE_CONTROL);

}



/**

 * xe_guc_rc_set_mode() - set new GUCRC mode

 * @guc: Xe GuC instance

 * @mode: new value of the mode.

 *

 * Function to set GuC RC mode to one of the enum values.

 *

 * Returns: 0 on success, negative error code on error

 */

int xe_guc_rc_set_mode(struct xe_guc *guc, enum slpc_gucrc_mode mode)

{

	guard(xe_pm_runtime_noresume)(guc_to_xe(guc));

	return xe_guc_pc_action_set_param(&guc->pc, SLPC_PARAM_PWRGATE_RC_MODE, mode);

}



/**

 * xe_guc_rc_unset_mode() - revert to default mode

 * @guc: Xe GuC instance

 *

 * Function to revert GuC RC mode to platform defaults.

 *

 * Returns: 0 on success, negative error code on error

 */

int xe_guc_rc_unset_mode(struct xe_guc *guc)

{

	guard(xe_pm_runtime_noresume)(guc_to_xe(guc));

	return xe_guc_pc_action_unset_param(&guc->pc, SLPC_PARAM_PWRGATE_RC_MODE);

}

drivers/gpu/drm/xe/xe_guc_rc.h

+3 −0
Original line number Diff line number Diff line
@@ -7,9 +7,12 @@ 
#define _XE_GUC_RC_H_



struct xe_guc;

enum slpc_gucrc_mode;



int xe_guc_rc_init(struct xe_guc *guc);

int xe_guc_rc_enable(struct xe_guc *guc);

void xe_guc_rc_disable(struct xe_guc *guc);

int xe_guc_rc_set_mode(struct xe_guc *guc, enum slpc_gucrc_mode mode);

int xe_guc_rc_unset_mode(struct xe_guc *guc);



#endif

drivers/gpu/drm/xe/xe_oa.c

+4 −5
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "xe_gt.h"

#include "xe_gt_mcr.h"

#include "xe_gt_printk.h"

#include "xe_guc_pc.h"

#include "xe_guc_rc.h"

#include "xe_macros.h"

#include "xe_mmio.h"

#include "xe_oa.h"
@@ -875,7 +875,7 @@ static void xe_oa_stream_destroy(struct xe_oa_stream *stream) 


	/* Wa_1509372804:pvc: Unset the override of GUCRC mode to enable rc6 */

	if (stream->override_gucrc)

		xe_gt_WARN_ON(gt, xe_guc_pc_unset_gucrc_mode(&gt->uc.guc.pc));

		xe_gt_WARN_ON(gt, xe_guc_rc_unset_mode(&gt->uc.guc));



	xe_oa_free_configs(stream);

	xe_file_put(stream->xef);
@@ -1765,8 +1765,7 @@ static int xe_oa_stream_init(struct xe_oa_stream *stream, 
	 * state. Prevent this by overriding GUCRC mode.

	 */

	if (XE_GT_WA(stream->gt, 1509372804)) {

		ret = xe_guc_pc_override_gucrc_mode(&gt->uc.guc.pc,

						    SLPC_GUCRC_MODE_GUCRC_NO_RC6);

		ret = xe_guc_rc_set_mode(&gt->uc.guc, SLPC_GUCRC_MODE_GUCRC_NO_RC6);

		if (ret)

			goto err_free_configs;
@@ -1824,7 +1823,7 @@ static int xe_oa_stream_init(struct xe_oa_stream *stream, 
	xe_force_wake_put(gt_to_fw(gt), stream->fw_ref);

	xe_pm_runtime_put(stream->oa->xe);

	if (stream->override_gucrc)

		xe_gt_WARN_ON(gt, xe_guc_pc_unset_gucrc_mode(&gt->uc.guc.pc));

		xe_gt_WARN_ON(gt, xe_guc_rc_unset_mode(&gt->uc.guc));

err_free_configs:

	xe_oa_free_configs(stream);

exit: