FAILED: patch "[PATCH] drm/i915: Remove memory frequency calculation" failed to apply to 5.14-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 59be177a909ac320e5f4b2a461ac09e20f35b2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= <[email protected]>
Date: Tue, 12 Oct 2021 18:00:46 -0700
Subject: [PATCH] drm/i915: Remove memory frequency calculation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This memory frequency calculated is only used to check if it is zero, what is not useful as it will never actually be zero.
Also the calculation is wrong, we should be checking other bit to select the appropriate frequency multiplier while this code is stuck with a fixed multiplier.
So here dropping it as whole.
v2:
- Also remove memory frequency calculation for gen9 LP platforms
drivers/gpu/drm/i915/i915_reg.h +0 -8
@@ -11048,12 +11048,6 @@ enum skl_power_gate {#define DC_STATE_DEBUG_MASK_CORES (1 << 0)#define DC_STATE_DEBUG_MASK_MEMORY_UP (1 << 1) -#define BXT_P_CR_MC_BIOS_REQ_0_0_0 _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x7114) -#define BXT_REQ_DATA_MASK 0x3F -#define BXT_DRAM_CHANNEL_ACTIVE_SHIFT 12 -#define BXT_DRAM_CHANNEL_ACTIVE_MASK (0xF << 12) -#define BXT_MEMORY_FREQ_MULTIPLIER_HZ 133333333 -#define BXT_D_CR_DRP0_DUNIT8 0x1000#define BXT_D_CR_DRP0_DUNIT9 0x1200#define BXT_D_CR_DRP0_DUNIT_START 8
@@ -11084,9 +11078,7 @@ enum skl_power_gate {#define BXT_DRAM_TYPE_LPDDR4 (0x2 << 22)#define BXT_DRAM_TYPE_DDR4 (0x4 << 22) -#define SKL_MEMORY_FREQ_MULTIPLIER_HZ 266666666#define SKL_MC_BIOS_DATA_0_0_0_MCHBAR_PCU _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5E04) -#define SKL_REQ_DATA_MASK (0xF << 0)#define DG1_GEAR_TYPE REG_BIT(16)#define SKL_MAD_INTER_CHANNEL_0_0_0_MCHBAR_MCMAIN _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5000)
drivers/gpu/drm/i915/intel_dram.c +2 -28
@@ -244,7 +244,6 @@ static int skl_get_dram_info(struct drm_i915_private *i915) {struct dram_info *dram_info = &i915->dram_info; -u32 mem_freq_khz, val;int ret; dram_info->type =skl_get_dram_type (i915);
@@ -255,17 +254,6 @@ skl_get_dram_info(struct drm_i915_private *i915)if (ret)return ret; - val =intel_uncore_read (&i915->uncore, -SKL_MC_BIOS_DATA_0_0_0_MCHBAR_PCU ); - mem_freq_khz =DIV_ROUND_UP ((val &SKL_REQ_DATA_MASK ) * -SKL_MEMORY_FREQ_MULTIPLIER_HZ ,1000 ); - -if (dram_info->num_channels * mem_freq_khz ==0 ) { -drm_info (&i915->drm, -"Couldn't get system memory bandwidth\n" ); -return -EINVAL ; - } -return 0 ; }
@@ -350,24 +338,10 @@ static void bxt_get_dimm_info(struct dram_dimm_info *dimm, u32 val)static int bxt_get_dram_info (struct drm_i915_private *i915) {struct dram_info *dram_info = &i915->dram_info; -u32 dram_channels; -u32 mem_freq_khz, val; -u8 num_active_channels, valid_ranks =0 ; +u32 val; +u8 valid_ranks =0 ;int i; - val =intel_uncore_read (&i915->uncore,BXT_P_CR_MC_BIOS_REQ_0_0_0 ); - mem_freq_khz =DIV_ROUND_UP ((val &BXT_REQ_DATA_MASK ) * -BXT_MEMORY_FREQ_MULTIPLIER_HZ ,1000 ); - - dram_channels = val &BXT_DRAM_CHANNEL_ACTIVE_MASK ; - num_active_channels =hweight32 (dram_channels); - -if (mem_freq_khz * num_active_channels ==0 ) { -drm_info (&i915->drm, -"Couldn't get system memory bandwidth\n" ); -return -EINVAL ; - } -/* * Now read each DUNIT8/9/10/11 to check the rank of each dimms. */
PATCH 1/1 drm/i915: Remove memory frequency calculation
This memory frequency calculated is only used to check if it is zero, what is not useful as it will never actually be zero.
Also the calculation is wrong, we should be checking other bit to select the appropriate frequency multiplier while this code is stuck with a fixed multiplier.
So here dropping it as whole.
v2:
- Also remove memory frequency calculation for gen9 LP platforms
--- drivers/gpu/drm/i915/i915_reg.h | 8 -------- drivers/gpu/drm/i915/intel_dram.c | 30 ++---------------------------- 2 files changed, 2 insertions(+), 36 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +0 -8
@@ -11021,12 +11021,6 @@ enum skl_power_gate {#define DC_STATE_DEBUG_MASK_CORES (1 << 0)#define DC_STATE_DEBUG_MASK_MEMORY_UP (1 << 1) -#define BXT_P_CR_MC_BIOS_REQ_0_0_0 _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x7114) -#define BXT_REQ_DATA_MASK 0x3F -#define BXT_DRAM_CHANNEL_ACTIVE_SHIFT 12 -#define BXT_DRAM_CHANNEL_ACTIVE_MASK (0xF << 12) -#define BXT_MEMORY_FREQ_MULTIPLIER_HZ 133333333 -#define BXT_D_CR_DRP0_DUNIT8 0x1000#define BXT_D_CR_DRP0_DUNIT9 0x1200#define BXT_D_CR_DRP0_DUNIT_START 8
@@ -11057,9 +11051,7 @@ enum skl_power_gate {#define BXT_DRAM_TYPE_LPDDR4 (0x2 << 22)#define BXT_DRAM_TYPE_DDR4 (0x4 << 22) -#define SKL_MEMORY_FREQ_MULTIPLIER_HZ 266666666#define SKL_MC_BIOS_DATA_0_0_0_MCHBAR_PCU _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5E04) -#define SKL_REQ_DATA_MASK (0xF << 0)#define SKL_MAD_INTER_CHANNEL_0_0_0_MCHBAR_MCMAIN _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5000)#define SKL_DRAM_DDR_TYPE_MASK (0x3 << 0)
drivers/gpu/drm/i915/intel_dram.c +2 -28
@@ -244,7 +244,6 @@ static int skl_get_dram_info(struct drm_i915_private *i915) {struct dram_info *dram_info = &i915->dram_info; -u32 mem_freq_khz, val;int ret; dram_info->type =skl_get_dram_type (i915);
@@ -255,17 +254,6 @@ skl_get_dram_info(struct drm_i915_private *i915)if (ret)return ret; - val =intel_uncore_read (&i915->uncore, -SKL_MC_BIOS_DATA_0_0_0_MCHBAR_PCU ); - mem_freq_khz =DIV_ROUND_UP ((val &SKL_REQ_DATA_MASK ) * -SKL_MEMORY_FREQ_MULTIPLIER_HZ ,1000 ); - -if (dram_info->num_channels * mem_freq_khz ==0 ) { -drm_info (&i915->drm, -"Couldn't get system memory bandwidth\n" ); -return -EINVAL ; - } -return 0 ; }
@@ -350,24 +338,10 @@ static void bxt_get_dimm_info(struct dram_dimm_info *dimm, u32 val)static int bxt_get_dram_info (struct drm_i915_private *i915) {struct dram_info *dram_info = &i915->dram_info; -u32 dram_channels; -u32 mem_freq_khz, val; -u8 num_active_channels, valid_ranks =0 ; +u32 val; +u8 valid_ranks =0 ;int i; - val =intel_uncore_read (&i915->uncore,BXT_P_CR_MC_BIOS_REQ_0_0_0 ); - mem_freq_khz =DIV_ROUND_UP ((val &BXT_REQ_DATA_MASK ) * -BXT_MEMORY_FREQ_MULTIPLIER_HZ ,1000 ); - - dram_channels = val &BXT_DRAM_CHANNEL_ACTIVE_MASK ; - num_active_channels =hweight32 (dram_channels); - -if (mem_freq_khz * num_active_channels ==0 ) { -drm_info (&i915->drm, -"Couldn't get system memory bandwidth\n" ); -return -EINVAL ; - } -/* * Now read each DUNIT8/9/10/11 to check the rank of each dimms. */
Signature · 1 line
2.33.1
Greg KH
maintainerRe: [PATCH] drm/i915: Remove memory frequency calculation
Quoted 12 lines · José Roberto de Souza
This memory frequency calculated is only used to check if it is zero, what is not useful as it will never actually be zero.
Also the calculation is wrong, we should be checking other bit to select the appropriate frequency multiplier while this code is stuck with a fixed multiplier.
So here dropping it as whole.
v2:
- Also remove memory frequency calculation for gen9 LP platforms
Quoted 8 lines
Cc <[email protected]> # 5.14-stableCc Yakui Zhao <[email protected]>Cc Matt Roper <[email protected]>Fixes 5d0c938ec9cc ("drm/i915/gen11+: Only load DRAM information from pcode")Signed-off-by José Roberto de Souza <[email protected]>Reviewed-by Matt Roper <[email protected]>(cherry picked from commit 83f52364b15265aec47d07e02b0fbf4093ab8554)
There is no such commit in Linus's tree.
What commit is this that is being backported?
confused,
greg k-h
Re: [PATCH] drm/i915: Remove memory frequency calculation
Quoted 22 lines · Greg KH
Quoted 12 lines · José Roberto de Souza
This memory frequency calculated is only used to check if it is zero, what is not useful as it will never actually be zero.
Also the calculation is wrong, we should be checking other bit to select the appropriate frequency multiplier while this code is stuck with a fixed multiplier.
So here dropping it as whole.
v2:
- Also remove memory frequency calculation for gen9 LP platformsQuoted 8 lines
Cc <[email protected]> # 5.14-stableCc Yakui Zhao <[email protected]>Cc Matt Roper <[email protected]>Fixes 5d0c938ec9cc ("drm/i915/gen11+: Only load DRAM information from pcode")Signed-off-by José Roberto de Souza <[email protected]>Reviewed-by Matt Roper <[email protected]>(cherry picked from commit 83f52364b15265aec47d07e02b0fbf4093ab8554)
Quoted 3 lines
There is no such commit in Linus's tree.
What commit is this that is being backported?
It is on Linus's tree:
Quoted 4 lines
confused,
greg k-h
[email protected]
maintainerRe: [PATCH] drm/i915: Remove memory frequency calculation
Quoted 23 lines · Jose
Quoted 22 lines · Greg KH
Quoted 20 lines · José Roberto de Souza
This memory frequency calculated is only used to check if it is zero, what is not useful as it will never actually be zero.
Also the calculation is wrong, we should be checking other bit to select the appropriate frequency multiplier while this code is stuck with a fixed multiplier.
So here dropping it as whole.
v2:
- Also remove memory frequency calculation for gen9 LP platformsCc <[email protected]> # 5.14-stableCc Yakui Zhao <[email protected]>Cc Matt Roper <[email protected]>Fixes 5d0c938ec9cc ("drm/i915/gen11+: Only load DRAM information from pcode")Signed-off-by José Roberto de Souza <[email protected]>Reviewed-by Matt Roper <[email protected]>(cherry picked from commit 83f52364b15265aec47d07e02b0fbf4093ab8554)
Quoted 7 lines
Quoted 3 lines
There is no such commit in Linus's tree.
What commit is this that is being backported?
It is on Linus's tree:
Now it is, yes, sorry. It is not in a public release yet, which is why my tools didn't catch this.
I guess you all want this in "now", so I'll go queue it up, but next time, please give us a hint as to what is going on...
thanks,
greg k-h
[email protected]
maintainerRe: [PATCH] drm/i915: Remove memory frequency calculation
In reply to Souza, JoseQuoted 23 lines · Jose
Quoted 22 lines · Greg KH
Quoted 20 lines · José Roberto de Souza
This memory frequency calculated is only used to check if it is zero, what is not useful as it will never actually be zero.
Also the calculation is wrong, we should be checking other bit to select the appropriate frequency multiplier while this code is stuck with a fixed multiplier.
So here dropping it as whole.
v2:
- Also remove memory frequency calculation for gen9 LP platformsCc <[email protected]> # 5.14-stableCc Yakui Zhao <[email protected]>Cc Matt Roper <[email protected]>Fixes 5d0c938ec9cc ("drm/i915/gen11+: Only load DRAM information from pcode")Signed-off-by José Roberto de Souza <[email protected]>Reviewed-by Matt Roper <[email protected]>(cherry picked from commit 83f52364b15265aec47d07e02b0fbf4093ab8554)
Quoted 7 lines
Quoted 3 lines
There is no such commit in Linus's tree.
What commit is this that is being backported?
It is on Linus's tree:
Ah, no, this is REALLY commit 59be177a909a ("drm/i915: Remove memory frequency calculation"), which came in 5.15.
{sigh}
Someday the i915 developers will fix up how they reference git sha ids and not do things that "look into the future" which causes so many confusions over the years.
ugh.
greg k-h