From 2417d5ca19e473de33fbc05173b86dc64b94c5f9 Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Fri, 14 Apr 2017 15:09:42 -0700 Subject: [PATCH] intel/genxml: Update genx_bits for gen10+ This commit adds a gen10 case to the switch statement and drops some unneeded code for handling gen numbers which doesn't work on gen10 and above. V2: Drop "z = float(z)" and the "z *= 10" lines Signed-off-by: Anuj Phogat Reviewed-by: Jason Ekstrand --- src/intel/genxml/gen_bits_header.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/intel/genxml/gen_bits_header.py b/src/intel/genxml/gen_bits_header.py index ac8ec4c41f4..1b3504073b0 100644 --- a/src/intel/genxml/gen_bits_header.py +++ b/src/intel/genxml/gen_bits_header.py @@ -80,6 +80,7 @@ static inline uint32_t ATTRIBUTE_PURE ${item.token_name}_${prop}(const struct gen_device_info *devinfo) { switch (devinfo->gen) { + case 10: return ${item.get_prop(prop, 10)}; case 9: return ${item.get_prop(prop, 9)}; case 8: return ${item.get_prop(prop, 8)}; case 7: @@ -167,10 +168,7 @@ class Gen(object): def __init__(self, z): # Convert potential "major.minor" string - z = float(z) - if z < 10: - z *= 10 - self.tenx = int(z) + self.tenx = int(float(z) * 10) def __lt__(self, other): return self.tenx < other.tenx -- 2.30.2