[Intel-gfx] [PATCH 3/9] x86/early-quirks: reverse the if ladders

[Matthew Auld]

Makes things much easier to follow.

Suggested-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
Signed-off-by: Matthew Auld <matthew.a...@intel.com>
Cc: Joonas Lahtinen <joonas.lahti...@linux.intel.com>
Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
Cc: Chris Wilson <ch...@chris-wilson.co.uk>
Cc: Paulo Zanoni <paulo.r.zan...@intel.com>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: H. Peter Anvin <h...@zytor.com>
Cc: x...@kernel.org
---
 arch/x86/kernel/early-quirks.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 3bc1e49d6c41..347951dab769 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -425,12 +425,12 @@ static resource_size_t __init chv_stolen_size(int num, 
int slot, int func)
         * 0x11 to 0x16: 4MB increments starting at 8MB
         * 0x17 to 0x1d: 4MB increments start at 36MB
         */
-       if (gms < 0x11)
-               return gms * MB(32);
-       else if (gms < 0x17)
+       if (gms >= 0x17)
+               return (gms - 0x17) * MB(4) + MB(36);
+       else if (gms >= 0x11)
                return (gms - 0x11) * MB(4) + MB(8);
        else
-               return (gms - 0x17) * MB(4) + MB(36);
+               return gms * MB(32);
 }
 
 static resource_size_t __init gen9_stolen_size(int num, int slot, int func)
@@ -443,10 +443,10 @@ static resource_size_t __init gen9_stolen_size(int num, 
int slot, int func)
 
        /* 0x0  to 0xef: 32MB increments starting at 0MB */
        /* 0xf0 to 0xfe: 4MB increments starting at 4MB */
-       if (gms < 0xf0)
-               return gms * MB(32);
-       else
+       if (gms >= 0xf0)
                return (gms - 0xf0) * MB(4) + MB(4);
+       else
+               return gms * MB(32);
 }
 
 struct intel_early_ops {
-- 
2.14.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx