intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Matthew Auld <matthew.auld@intel.com>
Cc: x86@kernel.org, Paulo Zanoni <paulo.r.zanoni@intel.com>,
	intel-gfx@lists.freedesktop.org,
	"H . Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@kernel.org>
Subject: Re: [PATCH 2/8] x86/early-quirks: replace the magical increment start values
Date: Fri, 24 Nov 2017 19:06:56 +0200	[thread overview]
Message-ID: <20171124170656.GO10981@intel.com> (raw)
In-Reply-To: <20171124164257.29955-3-matthew.auld@intel.com>

On Fri, Nov 24, 2017 at 04:42:51PM +0000, Matthew Auld wrote:
> Replace the magical +2, +9 etc. with +MB, which is far easier to read.
> 
> Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: H. Peter Anvin <hpa@zytor.com>
> Cc: x86@kernel.org
> ---
>  arch/x86/kernel/early-quirks.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index 3116f579841a..3bc1e49d6c41 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -428,9 +428,9 @@ static resource_size_t __init chv_stolen_size(int num, int slot, int func)
>  	if (gms < 0x11)
>  		return gms * MB(32);
>  	else if (gms < 0x17)
> -		return (gms - 0x11 + 2) * MB(4);
> +		return (gms - 0x11) * MB(4) + MB(8);
>  	else
> -		return (gms - 0x17 + 9) * MB(4);
> +		return (gms - 0x17) * MB(4) + MB(36);

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

But now I'm thinking we should also reverse the if ladders...

if (gms >= 0x17)
	return (gms - 0x17) * ...;
else if (gms >= 0x11)
	return (gms - 0x11) * ...;
else
	return gms * ...;

Better? I think so.

>  }
>  
>  static resource_size_t __init gen9_stolen_size(int num, int slot, int func)
> @@ -446,7 +446,7 @@ static resource_size_t __init gen9_stolen_size(int num, int slot, int func)
>  	if (gms < 0xf0)
>  		return gms * MB(32);
>  	else
> -		return (gms - 0xf0 + 1) * MB(4);
> +		return (gms - 0xf0) * MB(4) + MB(4);
>  }
>  
>  struct intel_early_ops {
> -- 
> 2.14.3

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2017-11-24 17:07 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-24 16:42 [PATCH 0/8] make stolen resource centric Matthew Auld
2017-11-24 16:42 ` [PATCH 1/8] x86/early-quirks: Extend Intel graphics stolen memory placement to 64bit Matthew Auld
2017-11-24 16:42 ` [PATCH 2/8] x86/early-quirks: replace the magical increment start values Matthew Auld
2017-11-24 17:06   ` Ville Syrjälä [this message]
2017-11-24 16:42 ` [PATCH 3/8] drm/i915: nuke the duplicated stolen discovery Matthew Auld
2017-11-24 16:42 ` [PATCH 4/8] drm/i915: s/mappable_end/mappable_size/ Matthew Auld
2017-11-24 16:42 ` [PATCH 5/8] drm/i915: make dsm struct resource centric Matthew Auld
2017-11-24 16:42 ` [PATCH 6/8] drm/i915: make reserved " Matthew Auld
2017-11-24 16:42 ` [PATCH 7/8] drm/i915: make mappable " Matthew Auld
2017-11-24 16:42 ` [PATCH 8/8] drm/i915: prefer resource_size_t for everything stolen Matthew Auld
2017-11-24 16:54   ` Chris Wilson
2017-11-24 17:56     ` Matthew Auld
2017-11-24 18:30       ` Chris Wilson
2017-11-24 17:02 ` ✓ Fi.CI.BAT: success for make stolen resource centric (rev2) Patchwork
2017-11-24 19:29 ` ✗ Fi.CI.IGT: failure " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2017-12-11 12:14 [PATCH 0/8] make stolen resource centric Matthew Auld
2017-12-11 12:14 ` [PATCH 2/8] x86/early-quirks: replace the magical increment start values Matthew Auld
2017-12-11 14:39   ` Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171124170656.GO10981@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=matthew.auld@intel.com \
    --cc=mingo@kernel.org \
    --cc=paulo.r.zanoni@intel.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).