From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8E071C6FD1D for ; Fri, 17 Mar 2023 09:15:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA0EB10EEA8; Fri, 17 Mar 2023 09:15:39 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6AA7C10EEA8 for ; Fri, 17 Mar 2023 09:15:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679044538; x=1710580538; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=Un5z/L5aaJ+9WWl8lebIi2UXcogUH1ZCjdTenEjn8sU=; b=N2XYI/3QHbPsQj8EMYIhwTVkBkhaKm6yk388v5MWXwBxfpCf03HWlKA+ stfiotyTzPrRDqUB4AcVehWCLuhEUjRKjCvTfqW0J26tfqM6ZW4MMf1gY VKPi1o9IDohmiI50RuoE+SuMwpGn7Qn89vkDJLoHbTUB07Eq1QmuQ2LTV Jkf+QN8yCyIQcj05M/iga9NSVIn1rffhYkccRkW69tralzcvpzV/5159L SmzFZ6PpvQRz90GVvN3St4YSFSo/kMNOCeR6wlRVWl6aiBdS6qyvb2akA 8O91IXAiYqvJurl8k0vZhJw2Hcu6ph9PNIvsYKuKo/a5wIS0qZekhfFOL w==; X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="365919377" X-IronPort-AV: E=Sophos;i="5.98,268,1673942400"; d="scan'208";a="365919377" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2023 02:15:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="657497910" X-IronPort-AV: E=Sophos;i="5.98,268,1673942400"; d="scan'208";a="657497910" Received: from ahajda-mobl.ger.corp.intel.com (HELO [10.213.22.107]) ([10.213.22.107]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2023 02:15:35 -0700 Message-ID: <1f460864-0195-aea3-fa22-60cd7a6cdb3e@intel.com> Date: Fri, 17 Mar 2023 10:15:33 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.9.0 Content-Language: en-US To: "Das, Nirmoy" , intel-gfx@lists.freedesktop.org References: <20230314151920.1065847-1-andrzej.hajda@intel.com> <3958487c-1110-aa2b-2b53-56a3fe23bf9a@linux.intel.com> From: Andrzej Hajda Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 In-Reply-To: <3958487c-1110-aa2b-2b53-56a3fe23bf9a@linux.intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Intel-gfx] [PATCH] drm/i915/gt: perform uc late init after probe error injection X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rodrigo Vivi , chris.p.wilson@linux.intel.com, Matthew Auld , Nirmoy Das Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 15.03.2023 11:05, Das, Nirmoy wrote: > > On 3/14/2023 4:19 PM, Andrzej Hajda wrote: >> Probe pseudo errors should be injected only in places where real errors >> can be encountered, otherwise unwinding code can be broken. >> Placing intel_uc_init_late before i915_inject_probe_error violated >> this rule, resulting in following bug: >> __intel_gt_disable:655 GEM_BUG_ON(intel_gt_pm_is_awake(gt)) >> >> Fixes: 481d458caede ("drm/i915/guc: Add golden context to GuC ADS") >> Signed-off-by: Andrzej Hajda > Acked-by: Nirmoy Das Thx Nirmoy and Andi, pushed. Regards Andrzej >> --- >>   drivers/gpu/drm/i915/gt/intel_gt.c | 4 ++-- >>   1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c >> b/drivers/gpu/drm/i915/gt/intel_gt.c >> index 6ca944d01eb677..38c62e4ad3eba2 100644 >> --- a/drivers/gpu/drm/i915/gt/intel_gt.c >> +++ b/drivers/gpu/drm/i915/gt/intel_gt.c >> @@ -736,12 +736,12 @@ int intel_gt_init(struct intel_gt *gt) >>       if (err) >>           goto err_gt; >> -    intel_uc_init_late(>->uc); >> - >>       err = i915_inject_probe_error(gt->i915, -EIO); >>       if (err) >>           goto err_gt; >> +    intel_uc_init_late(>->uc); >> + >>       intel_migrate_init(>->migrate, gt); >>       goto out_fw;