[PATCH][RESEND] i915: make array flex_regs static const

[PATCH][RESEND] i915: make array flex_regs static const

[Colin Ian King]

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

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>

---

RESEND: Use correct e-mail address for sign-off and From: in e-mail.

---
 drivers/gpu/drm/i915/i915_perf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index e27f3b7cf094..df698960fdc0 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -2114,7 +2114,7 @@ gen8_update_reg_state_unlocked(const struct intel_context *ce,
 	u32 ctx_oactxctrl = stream->perf->ctx_oactxctrl_offset;
 	u32 ctx_flexeu0 = stream->perf->ctx_flexeu0_offset;
 	/* The MMIO offsets for Flex EU registers aren't contiguous */
-	i915_reg_t flex_regs[] = {
+	static const i915_reg_t flex_regs[] = {
 		EU_PERF_CNTL0,
 		EU_PERF_CNTL1,
 		EU_PERF_CNTL2,
-- 
2.33.1

Re: [PATCH][RESEND] i915: make array flex_regs static const

[Jani Nikula]

On Wed, 12 Jan 2022, Colin Ian King <colin.i.king@gmail.com> wrote:
> Don't populate the read-only array flex_regs on the stack but
> instead it static const. Also makes the object code a little smaller.
>
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
>
> ---
>
> RESEND: Use correct e-mail address for sign-off and From: in e-mail.

There are a number of things at play here:

- Our tooling checks for certain things, such as author/signed-off-by
  match, after applying the patch.

- You have an entry in the kernel git .mailmap.

- The git log.mailmap config default has changed from false to true.

We apply the patch, and, with the default options, git show will display
a different author than the signed-off-by.

We should use --no-use-mailmap when examining a commit to ensure the
commit is internally consistent, regardless of .mailmap.


BR,
Jani.


>
> ---
>  drivers/gpu/drm/i915/i915_perf.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> index e27f3b7cf094..df698960fdc0 100644
> --- a/drivers/gpu/drm/i915/i915_perf.c
> +++ b/drivers/gpu/drm/i915/i915_perf.c
> @@ -2114,7 +2114,7 @@ gen8_update_reg_state_unlocked(const struct intel_context *ce,
>  	u32 ctx_oactxctrl = stream->perf->ctx_oactxctrl_offset;
>  	u32 ctx_flexeu0 = stream->perf->ctx_flexeu0_offset;
>  	/* The MMIO offsets for Flex EU registers aren't contiguous */
> -	i915_reg_t flex_regs[] = {
> +	static const i915_reg_t flex_regs[] = {
>  		EU_PERF_CNTL0,
>  		EU_PERF_CNTL1,
>  		EU_PERF_CNTL2,

-- 
Jani Nikula, Intel Open Source Graphics Center

Re: [PATCH][RESEND] i915: make array flex_regs static const

[Tvrtko Ursulin]

On 13/01/2022 09:21, Jani Nikula wrote:
> On Wed, 12 Jan 2022, Colin Ian King <colin.i.king@gmail.com> wrote:
>> Don't populate the read-only array flex_regs on the stack but
>> instead it static const. Also makes the object code a little smaller.
>>
>> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
>>
>> ---
>>
>> RESEND: Use correct e-mail address for sign-off and From: in e-mail.
> 
> There are a number of things at play here:
> 
> - Our tooling checks for certain things, such as author/signed-off-by
>    match, after applying the patch.
> 
> - You have an entry in the kernel git .mailmap.
> 
> - The git log.mailmap config default has changed from false to true.
> 
> We apply the patch, and, with the default options, git show will display
> a different author than the signed-off-by.
> 
> We should use --no-use-mailmap when examining a commit to ensure the
> commit is internally consistent, regardless of .mailmap.

Yes that sounds like the right thing to do.

In the meantime I have pushed this patch.

Regards,

Tvrtko