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 31E82C001B0 for ; Tue, 15 Aug 2023 17:51:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC0B310E16F; Tue, 15 Aug 2023 17:51:20 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 707F810E16F for ; Tue, 15 Aug 2023 17:51:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692121878; x=1723657878; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=wv/ge8YYlzg8Qhg0OcDTcbOmOouUj76XAX8uWdT9XFc=; b=IUpXdlmNQy+LMq3rBGAWIxgkS5JyVuOn81VArjURB3cZf2HC6aWEaYsq OoxIRIiUXNU7VQKKCPYuNlhwqCHDKXUSaZYTXhmJ11O+UTR7KWvydpNv7 jGHY4YmtB1cNXICTOvND1h86udtU0S0wwB7sVBezF+P2iyzxEo7/5luFm MhyhfnCpv9X5npsc1lS45BJjLlV5QcMyr0/Rt8FAynkil/rfqlkSteA9d DZjAsBJSL25DAfqXt+Tj+3pcfgAFlRWuN8IG12i0eZvQ4t08AmNNL+tUJ Z/J++1HaUVGG1kSVfe+Tuht5GwBZ0YK42Vgp9cFfEnNnH0U//XV2lpuRM g==; X-IronPort-AV: E=McAfee;i="6600,9927,10803"; a="369816478" X-IronPort-AV: E=Sophos;i="6.01,175,1684825200"; d="scan'208";a="369816478" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Aug 2023 10:51:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10803"; a="803902753" X-IronPort-AV: E=Sophos;i="6.01,175,1684825200"; d="scan'208";a="803902753" Received: from adixit-mobl.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.209.138.252]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Aug 2023 10:51:00 -0700 Date: Tue, 15 Aug 2023 10:50:59 -0700 Message-ID: <874jl0tcsc.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Matt Roper In-Reply-To: <20230815173611.142687-9-matthew.d.roper@intel.com> References: <20230815173611.142687-6-matthew.d.roper@intel.com> <20230815173611.142687-9-matthew.d.roper@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Subject: Re: [Intel-gfx] [PATCH 3/4] drm/i915/dg2: Drop pre-production GT workarounds 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: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, 15 Aug 2023 10:36:15 -0700, Matt Roper wrote: > Hi Matt, > diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c > index 04bc1f4a1115..eadbfd2fb9e5 100644 > --- a/drivers/gpu/drm/i915/i915_perf.c > +++ b/drivers/gpu/drm/i915/i915_perf.c > @@ -3381,25 +3381,6 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream, > intel_engine_pm_get(stream->engine); > intel_uncore_forcewake_get(stream->uncore, FORCEWAKE_ALL); > > - /* > - * Wa_16011777198:dg2: GuC resets render as part of the Wa. This causes > - * OA to lose the configuration state. Prevent this by overriding GUCRC > - * mode. > - */ > - if (intel_uc_uses_guc_rc(>->uc) && > - (IS_DG2_GRAPHICS_STEP(gt->i915, G10, STEP_A0, STEP_C0) || > - IS_DG2_GRAPHICS_STEP(gt->i915, G11, STEP_A0, STEP_B0))) { > - ret = intel_guc_slpc_override_gucrc_mode(>->uc.guc.slpc, > - SLPC_GUCRC_MODE_GUCRC_NO_RC6); > - if (ret) { > - drm_dbg(&stream->perf->i915->drm, > - "Unable to override gucrc mode\n"); > - goto err_gucrc; > - } > - > - stream->override_gucrc = true; > - } > - > ret = alloc_oa_buffer(stream); > if (ret) > goto err_oa_buf_alloc; > @@ -3439,7 +3420,6 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream, > if (stream->override_gucrc) > intel_guc_slpc_unset_gucrc_mode(>->uc.guc.slpc); > > -err_gucrc: > intel_uncore_forcewake_put(stream->uncore, FORCEWAKE_ALL); > intel_engine_pm_put(stream->engine); > If we are deleting this, let's basically remove all references to "gucrc" in this file and includes. So: * clean up the error path * Remove stream->override_gucrc * clean up i915_oa_stream_destroy Maybe the functions intel_guc_slpc_unset_gucrc_mode and intel_guc_slpc_override_gucrc_mode can also be removed. Let's wait to hear from Umesh/Vinay (Cc'd) who implemented this stuff. Thanks. -- Ashutosh