Commit 22aa20e4 authored by Ashutosh Dixit's avatar Ashutosh Dixit Committed by Jani Nikula
Browse files

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



This reverts commit ee892ea8.

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: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230319140300.2892032-1-ashutosh.dixit@intel.com
parent 59ad01c7

drivers/gpu/drm/i915/i915_hwmon.c

+0 −5
Original line number Diff line number Diff line
@@ -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)