Revert "drm/i915/hwmon: Enable PL1 power limit"

ashutoshx · jnikula · commit 22aa20e4c5dc · 2023-03-20T12:31:01.000+02:00
This reverts commit ee892ea. 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
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -687,11 +687,6 @@ hwm_get_preregistration_info(struct drm_i915_private *i915)`
`687`	`687`	`for_each_gt(gt, i915, i)`
`688`	`688`	`hwm_energy(&hwmon->ddat_gt[i], &energy);`
`689`	`689`	`}`
`690`		`-`
`691`		`- /* Enable PL1 power limit */`
`692`		`- if (i915_mmio_reg_valid(hwmon->rg.pkg_rapl_limit))`
`693`		`- hwm_locked_with_pm_intel_uncore_rmw(ddat, hwmon->rg.pkg_rapl_limit,`
`694`		`- PKG_PWR_LIM_1_EN, PKG_PWR_LIM_1_EN);`
`695`	`690`	`}`
`696`	`691`
`697`	`692`	`void i915_hwmon_register(struct drm_i915_private *i915)`