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 3C616C61DA4 for ; Sat, 18 Mar 2023 15:10:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C59589149; Sat, 18 Mar 2023 15:10:53 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 93B7910E082; Sat, 18 Mar 2023 15:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679152251; x=1710688251; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=AyrcR8mbjSSwV/+od0hf9a2MVnXYm+dbL+8qHFDOS6g=; b=iUPD8xbo5ylxMbxEA2aIKkRXzPfFLBZWswVlLB+3awUsJJDSssr+6vnJ JBBIz67kDATA04Kyal9J6YMzMno8ay2/NpG3bGKeGG+JE3CV/Cvs5H+jL sbXVjlDEgICZ/cub6X5W2ZMBGDFGnXeYnZ3CqTO3/Ush/qov1FxzdmXjE 77iHMs8EY7PdX+T6IuM6/Qf9sAZ52M0xiCfQYKfcZpsFf4vJWbf2EHE29 3g8ZmktyDovNPiuvUU0fqgFbYoYdgBt93bhfUFhtCHuKGVuMD70jx9XgQ ODR3lPbOKmmZYV+YSEBYvAi8kWNIqNPuTOh35X0+l0Tla2VZk4kdISb2Y w==; X-IronPort-AV: E=McAfee;i="6600,9927,10652"; a="339977830" X-IronPort-AV: E=Sophos;i="5.98,271,1673942400"; d="scan'208";a="339977830" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2023 08:10:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10652"; a="710818120" X-IronPort-AV: E=Sophos;i="5.98,271,1673942400"; d="scan'208";a="710818120" Received: from adixit-mobl.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.212.58.30]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2023 08:10:50 -0700 Date: Sat, 18 Mar 2023 08:10:49 -0700 Message-ID: <878rfuw0w6.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Jani Nikula , Rodrigo Vivi In-Reply-To: <87a60awxdx.wl-ashutosh.dixit@intel.com> References: <20230208190312.1611335-1-ashutosh.dixit@intel.com> <877cwjq6rp.fsf@intel.com> <875yc2oq0c.wl-ashutosh.dixit@intel.com> <87a60awxdx.wl-ashutosh.dixit@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/28.2 (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] Reverted patch reappears! 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, dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, 17 Mar 2023 20:28:58 -0700, Dixit, Ashutosh wrote: > > Jani/Rodrigo, > > Original Subject: Re: [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit" > > On Wed, 15 Feb 2023 09:19:07 -0800, Rodrigo Vivi wrote: > > > > On Wed, Feb 15, 2023 at 08:24:51AM -0800, Dixit, Ashutosh wrote: > > > On Wed, 15 Feb 2023 07:37:30 -0800, Jani Nikula wrote: > > > > > > > > On Wed, 08 Feb 2023, Rodrigo Vivi wrote: > > > > > On Wed, Feb 08, 2023 at 11:03:12AM -0800, Ashutosh Dixit wrote: > > > > >> This reverts commit 0349c41b05968befaffa5fbb7e73d0ee6004f610. > > > > >> > > > > >> 0349c41b0596 ("drm/i915/hwmon: Enable PL1 power limit") is incorrect and > > > > >> caused a major regression on ATSM. The change enabled the PL1 power limit > > > > >> but FW sets the default value of the PL1 limit to 0 which implies HW now > > > > >> works at minimum power and therefore the lowest effective frequency. This > > > > >> means all workloads now run slower resulting in even GuC FW load operations > > > > >> timing out, rendering ATSM unusable. > > > > >> > > > > >> A different solution to the original issue of the PL1 limit being disabled > > > > >> on ATSM is needed but till that is developed, revert 0349c41b0596. > > > > >> > > > > >> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8062 > > > > > > > > > > pushed to drm-intel-next and removed from drm-intel-fixes. > > > > > > > > > > Thanks for the quick reaction. > > > > > > > > Please always add Fixes: tags also to reverts. > > > > > > > > I suppose we should fix dim to also detect reverts, but I ended up > > > > cherry-picking and pushing the original commit out to > > > > drm-intel-next-fixes before realizing it's been reverted. > > > > > > Oops, sorry! > > > > That's my mistake. I should had thought about this when pushing > > and removing from the fixes. I just realized yet, when this patch > > showed up in my -fixes cherry-pick again, but without the revert. > > > > I'm sorry. > > Not sure if it's related to this, but the reverted patch below has > reappeared on drm-tip. Newest on top: > > ee892ea83d996 drm/i915/hwmon: Enable PL1 power limit > 05d5562e401eb Revert "drm/i915/hwmon: Enable PL1 power limit" > 0349c41b05968 drm/i915/hwmon: Enable PL1 power limit > > The new patch is: > > commit ee892ea83d99610fa33bea612de058e0955eec3a > Author: Ashutosh Dixit > AuthorDate: Fri Feb 3 07:53:09 2023 -0800 > Commit: Jani Nikula > CommitDate: Mon Mar 13 11:38:05 2023 +0200 > > drm/i915/hwmon: Enable PL1 power limit > > Sorry I couldn't track which branch did this new patch come from (looks > like drm-tip itself?). > > This is breaking ATSM again: > > https://intel-gfx-ci.01.org/tree/drm-tip/bat-atsm-1.html > > so needs to be reverted again and stay reverted. I could send a revert or > any of you can also do it. I have sent out the revert of ee892ea83d996: https://patchwork.freedesktop.org/series/113793/ ee892ea83d996 is also present in Linus' tree (in v6.3-rc2) so will need to be reverted there too. The previous two commits (the original commit and its revert) are not present in Linus' tree, at least yet. Thanks. -- Ashutosh