From: Sasha Levin Date: Sun, 7 May 2023 00:27:56 +0000 (-0400) Subject: Drop drm-i915-hwmon-enable-pl1-power-limit.patch X-Git-Tag: v5.15.111~96 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7249554dd6e94075a20c6022c43e759741e011d;p=thirdparty%2Fkernel%2Fstable-queue.git Drop drm-i915-hwmon-enable-pl1-power-limit.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.2/drm-i915-hwmon-enable-pl1-power-limit.patch b/queue-6.2/drm-i915-hwmon-enable-pl1-power-limit.patch deleted file mode 100644 index 5b163ae46cf..00000000000 --- a/queue-6.2/drm-i915-hwmon-enable-pl1-power-limit.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 45abf2df92eab433d48738c4d71356c8a9e73d52 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 3 Feb 2023 07:53:09 -0800 -Subject: drm/i915/hwmon: Enable PL1 power limit - -From: Ashutosh Dixit - -[ Upstream commit 0349c41b05968befaffa5fbb7e73d0ee6004f610 ] - -Previous documentation suggested that PL1 power limit is always -enabled. However we now find this not to be the case on some -platforms (such as ATSM). Therefore enable PL1 power limit during hwmon -initialization. - -Bspec: 51864 - -v2: Add Bspec reference (Gwan-gyeong) -v3: Add Fixes tag - -Fixes: 99f55efb79114 ("drm/i915/hwmon: Power PL1 limit and TDP setting") -Signed-off-by: Ashutosh Dixit -Reviewed-by: Gwan-gyeong Mun -Signed-off-by: Rodrigo Vivi -Link: https://patchwork.freedesktop.org/patch/msgid/20230203155309.1042297-1-ashutosh.dixit@intel.com -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/i915/i915_hwmon.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c -index c588a17f97e98..6ef7af7c17460 100644 ---- a/drivers/gpu/drm/i915/i915_hwmon.c -+++ b/drivers/gpu/drm/i915/i915_hwmon.c -@@ -656,6 +656,11 @@ 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.39.2 - diff --git a/queue-6.2/series b/queue-6.2/series index 4462bf44331..8e92e986f63 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -132,7 +132,6 @@ erofs-stop-parsing-non-compact-head-index-if-cluster.patch erofs-initialize-packed-inode-after-root-inode-is-as.patch erofs-fix-potential-overflow-calculating-xattr_isize.patch drm-rockchip-drop-unbalanced-obj-unref.patch -drm-i915-hwmon-enable-pl1-power-limit.patch drm-i915-dg2-drop-one-pci-id.patch drm-vgem-add-missing-mutex_destroy.patch drm-probe-helper-cancel-previous-job-before-starting.patch diff --git a/queue-6.3/drm-i915-hwmon-enable-pl1-power-limit.patch b/queue-6.3/drm-i915-hwmon-enable-pl1-power-limit.patch deleted file mode 100644 index 5f3282ec7d2..00000000000 --- a/queue-6.3/drm-i915-hwmon-enable-pl1-power-limit.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f36516792c773ce0628fa84dd144710682419f35 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 3 Feb 2023 07:53:09 -0800 -Subject: drm/i915/hwmon: Enable PL1 power limit - -From: Ashutosh Dixit - -[ Upstream commit 0349c41b05968befaffa5fbb7e73d0ee6004f610 ] - -Previous documentation suggested that PL1 power limit is always -enabled. However we now find this not to be the case on some -platforms (such as ATSM). Therefore enable PL1 power limit during hwmon -initialization. - -Bspec: 51864 - -v2: Add Bspec reference (Gwan-gyeong) -v3: Add Fixes tag - -Fixes: 99f55efb79114 ("drm/i915/hwmon: Power PL1 limit and TDP setting") -Signed-off-by: Ashutosh Dixit -Reviewed-by: Gwan-gyeong Mun -Signed-off-by: Rodrigo Vivi -Link: https://patchwork.freedesktop.org/patch/msgid/20230203155309.1042297-1-ashutosh.dixit@intel.com -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/i915/i915_hwmon.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c -index 1225bc432f0d5..4683a5b96eff1 100644 ---- a/drivers/gpu/drm/i915/i915_hwmon.c -+++ b/drivers/gpu/drm/i915/i915_hwmon.c -@@ -687,6 +687,11 @@ 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.39.2 - diff --git a/queue-6.3/series b/queue-6.3/series index d2adc5f7a06..95d207b75ef 100644 --- a/queue-6.3/series +++ b/queue-6.3/series @@ -119,7 +119,6 @@ erofs-initialize-packed-inode-after-root-inode-is-as.patch erofs-fix-potential-overflow-calculating-xattr_isize.patch accel-ivpu-pm-remove-broken-ivpu_dbg-statements.patch drm-rockchip-drop-unbalanced-obj-unref.patch -drm-i915-hwmon-enable-pl1-power-limit.patch drm-i915-dg2-drop-one-pci-id.patch drm-vgem-add-missing-mutex_destroy.patch drm-probe-helper-cancel-previous-job-before-starting.patch