[Intel-gfx] [PATCH] drm/i915/dpll: make read-only array div1_vals static const

[Intel-gfx] [PATCH] drm/i915/dpll: make read-only array div1_vals static const

[Colin Ian King]

Don't populate the read-only array div1_vals on the stack but
instead make it static const. Also makes the object code a little
smaller.

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index 569903d47aea..17668b58b30c 100644
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -2759,7 +2759,7 @@ static bool icl_mg_pll_find_divisors(int clock_khz, bool is_dp, bool use_ssc,
 				     bool is_dkl)
 {
 	u32 dco_min_freq, dco_max_freq;
-	int div1_vals[] = {7, 5, 3, 2};
+	static const int div1_vals[] = {7, 5, 3, 2};
 	unsigned int i;
 	int div2;
 
-- 
2.35.1

[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/dpll: make read-only array div1_vals static const

[Patchwork]

== Series Details ==

Series: drm/i915/dpll: make read-only array div1_vals static const
URL   : https://patchwork.freedesktop.org/series/101152/
State : failure

== Summary ==

Applying: drm/i915/dpll: make read-only array div1_vals static const
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_dpll_mgr.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dpll_mgr.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/dpll: make read-only array div1_vals static const
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Re: [Intel-gfx] [PATCH] drm/i915/dpll: make read-only array div1_vals static const

[Jani Nikula]

On Mon, 07 Mar 2022, Colin Ian King <colin.i.king@gmail.com> wrote:
> Don't populate the read-only array div1_vals on the stack but
> instead make it static const. Also makes the object code a little
> smaller.

Thanks, but this was just fixed in commit fe70b262e781 ("drm/i915: Move
a bunch of stuff into rodata from the stack").

BR,
Jani.

>
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> ---
>  drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> index 569903d47aea..17668b58b30c 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> @@ -2759,7 +2759,7 @@ static bool icl_mg_pll_find_divisors(int clock_khz, bool is_dp, bool use_ssc,
>  				     bool is_dkl)
>  {
>  	u32 dco_min_freq, dco_max_freq;
> -	int div1_vals[] = {7, 5, 3, 2};
> +	static const int div1_vals[] = {7, 5, 3, 2};
>  	unsigned int i;
>  	int div2;

-- 
Jani Nikula, Intel Open Source Graphics Center