From: Ashutosh Dixit <ashutosh.dixit@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: stable@vger.kernel.org, dri-devel@lists.freedesktop.org,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"
Date: Sun, 19 Mar 2023 07:03:00 -0700 [thread overview]
Message-ID: <20230319140300.2892032-1-ashutosh.dixit@intel.com> (raw)
This reverts commit ee892ea83d99610fa33bea612de058e0955eec3a.
0349c41b0596 ("drm/i915/hwmon: Enable PL1 power limit") was reverted in
05d5562e401e ("Revert "drm/i915/hwmon: Enable PL1 power limit"") but has
appeared again as ee892ea83d99 ("drm/i915/hwmon: Enable PL1 power
limit"). Revert it again.
Cc: <stable@vger.kernel.org> # v6.2+
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Bug: https://gitlab.freedesktop.org/drm/intel/-/issues/8062
Fixes: ee892ea83d99 ("drm/i915/hwmon: Enable PL1 power limit")
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
drivers/gpu/drm/i915/i915_hwmon.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c
index ee63a8fd88fc1..596dd2c070106 100644
--- a/drivers/gpu/drm/i915/i915_hwmon.c
+++ b/drivers/gpu/drm/i915/i915_hwmon.c
@@ -688,11 +688,6 @@ hwm_get_preregistration_info(struct drm_i915_private *i915)
for_each_gt(gt, i915, i)
hwm_energy(&hwmon->ddat_gt[i], &energy);
}
-
- /* Enable PL1 power limit */
- if (i915_mmio_reg_valid(hwmon->rg.pkg_rapl_limit))
- hwm_locked_with_pm_intel_uncore_rmw(ddat, hwmon->rg.pkg_rapl_limit,
- PKG_PWR_LIM_1_EN, PKG_PWR_LIM_1_EN);
}
void i915_hwmon_register(struct drm_i915_private *i915)
--
2.38.0
next reply other threads:[~2023-03-19 14:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-19 14:03 Ashutosh Dixit [this message]
2023-03-19 15:25 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Revert "drm/i915/hwmon: Enable PL1 power limit" (rev3) Patchwork
2023-03-19 15:25 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-03-19 15:25 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2023-03-19 15:43 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-03-19 16:51 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-03-20 10:35 ` [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit" Jani Nikula
-- strict thread matches above, loose matches on Subject: below --
2023-03-18 14:59 Ashutosh Dixit
2023-02-08 19:03 Ashutosh Dixit
2023-02-08 20:08 ` Rodrigo Vivi
2023-02-15 15:37 ` Jani Nikula
2023-02-15 16:24 ` Dixit, Ashutosh
2023-02-15 17:19 ` Rodrigo Vivi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230319140300.2892032-1-ashutosh.dixit@intel.com \
--to=ashutosh.dixit@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox