projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
59ad01c
)
Revert "drm/i915/hwmon: Enable PL1 power limit"
author
Ashutosh Dixit
<ashutosh.dixit@intel.com>
Sun, 19 Mar 2023 14:03:00 +0000
(07:03 -0700)
committer
Jani Nikula
<jani.nikula@intel.com>
Mon, 20 Mar 2023 10:31:01 +0000
(12:31 +0200)
This reverts commit
ee892ea83d99610fa33bea612de058e0955eec3a
.
It was accidentally picked up for backporting. Revert.
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20230319140300.2892032-1-ashutosh.dixit@intel.com
drivers/gpu/drm/i915/i915_hwmon.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_hwmon.c
b/drivers/gpu/drm/i915/i915_hwmon.c
index 4683a5b96eff1424ccefbba397b19a656bbaa502..1225bc432f0d59ef79f185cf76f2725618295e46 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_hwmon.c
+++ b/
drivers/gpu/drm/i915/i915_hwmon.c
@@
-687,11
+687,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)