[PATCH v4 1/2] drm/xe/xe_gt_idle: modify powergate enable condition

[Chauhan, Shekhar]

On 9/5/2024 10:58 AM, Riana Tauro wrote:
> modify powergate enable condition based on the type of GT or presence of
Minor cosmetic change: We usually tend to begin the commit description 
with a capital letter.
> media engines. Also have a copy of the value written to powergate enable
> register.
>
> v2: add condition to enable render or media powergating (Badal)
>
> Signed-off-by: Riana Tauro <riana.tauro at intel.com>
Other than the above mentioned cosmetic change, LGTM, and with that,
Reviewed-by: Shekhar Chauhan <shekhar.chauhan at intel.com>
> ---
>   drivers/gpu/drm/xe/xe_gt_idle.c       | 26 ++++++++++++++++++--------
>   drivers/gpu/drm/xe/xe_gt_idle_types.h |  2 ++
>   2 files changed, 20 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_gt_idle.c b/drivers/gpu/drm/xe/xe_gt_idle.c
> index 67aba4140510..3924f9f3d0a5 100644
> --- a/drivers/gpu/drm/xe/xe_gt_idle.c
> +++ b/drivers/gpu/drm/xe/xe_gt_idle.c
> @@ -98,7 +98,8 @@ static u64 get_residency_ms(struct xe_gt_idle *gtidle, u64 cur_residency)
>   void xe_gt_idle_enable_pg(struct xe_gt *gt)
>   {
>   	struct xe_device *xe = gt_to_xe(gt);
> -	u32 pg_enable;
> +	struct xe_gt_idle *gtidle = &gt->gtidle;
> +	u32 vcs_mask, vecs_mask;
>   	int i, j;
>   
>   	if (IS_SRIOV_VF(xe))
> @@ -110,12 +111,19 @@ void xe_gt_idle_enable_pg(struct xe_gt *gt)
>   
>   	xe_device_assert_mem_access(gt_to_xe(gt));
>   
> -	pg_enable = RENDER_POWERGATE_ENABLE | MEDIA_POWERGATE_ENABLE;
> +	vcs_mask = xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_VIDEO_DECODE);
> +	vecs_mask = xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_VIDEO_ENHANCE);
> +
> +	if (vcs_mask || vecs_mask)
> +		gtidle->powergate_enable = MEDIA_POWERGATE_ENABLE;
> +
> +	if (!xe_gt_is_media_type(gt))
> +		gtidle->powergate_enable |= RENDER_POWERGATE_ENABLE;
>   
>   	for (i = XE_HW_ENGINE_VCS0, j = 0; i <= XE_HW_ENGINE_VCS7; ++i, ++j) {
>   		if ((gt->info.engine_mask & BIT(i)))
> -			pg_enable |= (VDN_HCP_POWERGATE_ENABLE(j) |
> -				      VDN_MFXVDENC_POWERGATE_ENABLE(j));
> +			gtidle->powergate_enable |= (VDN_HCP_POWERGATE_ENABLE(j) |
> +						     VDN_MFXVDENC_POWERGATE_ENABLE(j));
>   	}
>   
>   	XE_WARN_ON(xe_force_wake_get(gt_to_fw(gt), XE_FW_GT));
> @@ -128,20 +136,22 @@ void xe_gt_idle_enable_pg(struct xe_gt *gt)
>   		xe_mmio_write32(gt, RENDER_POWERGATE_IDLE_HYSTERESIS, 25);
>   	}
>   
> -	xe_mmio_write32(gt, POWERGATE_ENABLE, pg_enable);
> +	xe_mmio_write32(gt, POWERGATE_ENABLE, gtidle->powergate_enable);
>   	XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FW_GT));
>   }
>   
>   void xe_gt_idle_disable_pg(struct xe_gt *gt)
>   {
> +	struct xe_gt_idle *gtidle = &gt->gtidle;
> +
>   	if (IS_SRIOV_VF(gt_to_xe(gt)))
>   		return;
>   
>   	xe_device_assert_mem_access(gt_to_xe(gt));
> -	XE_WARN_ON(xe_force_wake_get(gt_to_fw(gt), XE_FW_GT));
> -
> -	xe_mmio_write32(gt, POWERGATE_ENABLE, 0);
> +	gtidle->powergate_enable = 0;
>   
> +	XE_WARN_ON(xe_force_wake_get(gt_to_fw(gt), XE_FW_GT));
> +	xe_mmio_write32(gt, POWERGATE_ENABLE, gtidle->powergate_enable);
>   	XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FW_GT));
>   }
>   
> diff --git a/drivers/gpu/drm/xe/xe_gt_idle_types.h b/drivers/gpu/drm/xe/xe_gt_idle_types.h
> index f99b447534f3..7a8e63f2ebcc 100644
> --- a/drivers/gpu/drm/xe/xe_gt_idle_types.h
> +++ b/drivers/gpu/drm/xe/xe_gt_idle_types.h
> @@ -23,6 +23,8 @@ enum xe_gt_idle_state {
>   struct xe_gt_idle {
>   	/** @name: name */
>   	char name[16];
> +	/** powergate_enable: copy of powergate enable bits*/
> +	u32 powergate_enable;
>   	/** @residency_multiplier: residency multiplier in ns */
>   	u32 residency_multiplier;
>   	/** @cur_residency: raw driver copy of idle residency */

-- 
-shekhar