release 6.15.4
This commit is contained in:
@@ -1,40 +0,0 @@
|
||||
From 96e19aa45a528ce5c722f1925d750f74efe22a8b Mon Sep 17 00:00:00 2001
|
||||
From: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
|
||||
Date: Fri, 13 Jun 2025 11:42:46 +0530
|
||||
Subject: drm/i915/snps_hdmi_pll: Fix 64-bit divisor truncation by using
|
||||
div64_u64
|
||||
|
||||
DIV_ROUND_CLOSEST_ULL uses do_div(), which expects a 32-bit divisor.
|
||||
When passing a 64-bit constant like CURVE2_MULTIPLIER, the value is
|
||||
silently truncated to u32, potentially leading to incorrect results
|
||||
on large divisors.
|
||||
|
||||
Replace DIV_ROUND_CLOSEST_ULL with div64_u64(), which correctly
|
||||
handles full 64-bit division. Since the result is clamped between
|
||||
1 and 127, rounding is unnecessary and truncating division
|
||||
is sufficient.
|
||||
|
||||
Fixes: 5947642004bf ("drm/i915/display: Add support for SNPS PHY HDMI PLL algorithm for DG2")
|
||||
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
|
||||
Cc: Suraj Kandpal <suraj.kandpal@intel.com>
|
||||
Cc: Jani Nikula <jani.nikula@intel.com>
|
||||
Cc: <stable@vger.kernel.org> # v6.15+
|
||||
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
|
||||
Cherry-picked-for: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/145
|
||||
---
|
||||
drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c
|
||||
@@ -103,8 +103,8 @@ static void get_ana_cp_int_prop(u64 vco_
|
||||
DIV_ROUND_DOWN_ULL(curve_1_interpolated, CURVE0_MULTIPLIER)));
|
||||
|
||||
ana_cp_int_temp =
|
||||
- DIV_ROUND_CLOSEST_ULL(DIV_ROUND_DOWN_ULL(adjusted_vco_clk1, curve_2_scaled1),
|
||||
- CURVE2_MULTIPLIER);
|
||||
+ div64_u64(DIV_ROUND_DOWN_ULL(adjusted_vco_clk1, curve_2_scaled1),
|
||||
+ CURVE2_MULTIPLIER);
|
||||
|
||||
*ana_cp_int = max(1, min(ana_cp_int_temp, 127));
|
||||
|
@@ -94,7 +94,7 @@ Contains:
|
||||
-#endif
|
||||
--- a/drivers/ata/ahci.c
|
||||
+++ b/drivers/ata/ahci.c
|
||||
@@ -1629,7 +1629,7 @@ static irqreturn_t ahci_thunderx_irq_han
|
||||
@@ -1662,7 +1662,7 @@ static irqreturn_t ahci_thunderx_irq_han
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -103,7 +103,7 @@ Contains:
|
||||
struct ahci_host_priv *hpriv)
|
||||
{
|
||||
int i;
|
||||
@@ -1642,7 +1642,7 @@ static void ahci_remap_check(struct pci_
|
||||
@@ -1675,7 +1675,7 @@ static void ahci_remap_check(struct pci_
|
||||
pci_resource_len(pdev, bar) < SZ_512K ||
|
||||
bar != AHCI_PCI_BAR_STANDARD ||
|
||||
!(readl(hpriv->mmio + AHCI_VSCAP) & 1))
|
||||
@@ -112,7 +112,7 @@ Contains:
|
||||
|
||||
cap = readq(hpriv->mmio + AHCI_REMAP_CAP);
|
||||
for (i = 0; i < AHCI_MAX_REMAP; i++) {
|
||||
@@ -1657,18 +1657,11 @@ static void ahci_remap_check(struct pci_
|
||||
@@ -1690,18 +1690,11 @@ static void ahci_remap_check(struct pci_
|
||||
}
|
||||
|
||||
if (!hpriv->remapped_nvme)
|
||||
@@ -135,7 +135,7 @@ Contains:
|
||||
}
|
||||
|
||||
static int ahci_get_irq_vector(struct ata_host *host, int port)
|
||||
@@ -1912,7 +1905,9 @@ static int ahci_init_one(struct pci_dev
|
||||
@@ -1945,7 +1938,9 @@ static int ahci_init_one(struct pci_dev
|
||||
return -ENOMEM;
|
||||
|
||||
/* detect remapped nvme devices */
|
||||
|
Reference in New Issue
Block a user