On Mon, 04 Oct 2021, Dave Airlie <airlied@xxxxxxxxx> wrote:
> From: Dave Airlie <airlied@xxxxxxxxxx>
>
> This was causing infinite recursion on snb/ivb.
>
> Fixes: 5716c8c6f4b6 ("drm/i915/uncore: split the fw get function into separate vfunc")
> Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_uncore.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index 2dac69d92c1b..f1b816ebcdf6 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -346,7 +346,7 @@ static void __gen6_gt_wait_for_thread_c0(struct intel_uncore *uncore)
> static void fw_domains_get_with_thread_status(struct intel_uncore *uncore,
> enum forcewake_domains fw_domains)
> {
> - fw_domains_get(uncore, fw_domains);
> + fw_domains_get_normal(uncore, fw_domains);
Pushed, thanks for the patch.
BR,
Jani.
>
> /* WaRsForcewakeWaitTC0:snb,ivb,hsw,bdw,vlv */
> __gen6_gt_wait_for_thread_c0(uncore);
--
Jani Nikula, Intel Open Source Graphics Center
