From: Sasha Levin Date: Sun, 19 Mar 2023 17:14:26 +0000 (-0400) Subject: Drop drm-i915-hwmon-enable-pl1-power-limit.patch X-Git-Tag: v4.14.311~62 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=782279aa1028cbd5f097d7b7182531e3f279c856;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 a688b5d2b5b..00000000000 --- a/queue-6.2/drm-i915-hwmon-enable-pl1-power-limit.patch +++ /dev/null @@ -1,50 +0,0 @@ -From bb3f89a6c3e607a5ea71fb4754e11177585bf56e 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 ee892ea83d99610fa33bea612de058e0955eec3a ] - -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 -(cherry picked from commit 0349c41b05968befaffa5fbb7e73d0ee6004f610) -Signed-off-by: Jani Nikula -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 93dc64161d4..40008d68034 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -42,7 +42,6 @@ vhost-vdpa-free-iommu-domain-after-last-use-during-c.patch vdpa_sim-not-reset-state-in-vdpasim_queue_ready.patch vdpa_sim-set-last_used_idx-as-last_avail_idx-in-vdpa.patch pci-s390-fix-use-after-free-of-pci-resources-with-pe.patch -drm-i915-hwmon-enable-pl1-power-limit.patch drm-i915-psr-use-calculated-io-and-fast-wake-lines.patch drm-i915-sseu-fix-max_subslices-array-index-out-of-b.patch bnxt_en-reset-phc-frequency-in-free-running-mode.patch