drm/msm: Fix gen_header.py for older python3 versions
PATCH 1/1 drm/msm: Fix gen_header.py for older python3 versions
The gen_header.py script is failing for older versions of python3 such as python 3.5. Two issues observed with python 3.5 are ...
1. Python 3 versions prior to 3.6 do not support the f-string format.
2. Early python 3 versions do not support the 'required' argument for the argparse add_subparsers().
Fix both of the above so that older versions of python 3 still work.
--- drivers/gpu/drm/msm/registers/gen_header.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/registers/gen_header.py +3 -2
@@ -323,7 +323,7 @@ class Array(object): indices = [] if self.length != 1: if self.fixed_offsets: - indices.append((self.index_ctype(), None, f"__offset_{self.local_name}")) + indices.append((self.index_ctype(), None, "__offset_%s" % self.local_name)) else: indices.append((self.index_ctype(), self.stride, None)) return indices
@@ -942,7 +942,8 @@ def main(): parser.add_argument('--rnn', type=str, required=True) parser.add_argument('--xml', type=str, required=True) - subparsers = parser.add_subparsers(required=True) + subparsers = parser.add_subparsers() + subparsers.required = True parser_c_defines = subparsers.add_parser('c-defines') parser_c_defines.set_defaults(func=dump_c_defines)
Signature · 1 line
2.34.1
Hi all,
Quoted 29 lines · Jon Hunter
The
gen_header.pyscript is failing for older versions of python3 such as python 3.5. Two issues observed with python 3.5 are ...1. Python 3 versions prior to 3.6 do not support the f-string format.
2. Early python 3 versions do not support the 'required' argument for the argparseadd_subparsers().Fix both of the above so that older versions of python 3 still work.
Fixes 8f7abf0b86fe ("drm/msm: generate headers on the fly")Signed-off-by Jon Hunter <[email protected]>--- drivers/gpu/drm/msm/registers/gen_header.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/registers/gen_header.py +1
-1@@ -323,7 +323,7 @@ class Array(object): indices = [] if self.length != 1: if self.fixed_offsets: - indices.append((self.index_ctype(), None, f"__offset_{self.local_name}")) + indices.append((self.index_ctype(), None, "__offset_%s" % self.local_name)) else: indices.append((self.index_ctype(), self.stride, None)) return indices
drivers/gpu/drm/msm/registers/gen_header.py def main(): · line 949
Quoted 9 lines
drivers/gpu/drm/msm/registers/gen_header.py +2
-1@@ -942,7 +942,8 @@ def main(): parser.add_argument('--rnn', type=str, required=True) parser.add_argument('--xml', type=str, required=True) - subparsers = parser.add_subparsers(required=True) + subparsers = parser.add_subparsers() + subparsers.required = True parser_c_defines = subparsers.add_parser('c-defines') parser_c_defines.set_defaults(func=dump_c_defines)
Any feedback on this? All our farm builders are still broken :-(
Thanks
Jon
Signature · 1 line
nvpublic
Quoted 9 lines · Jon Hunter
The
gen_header.pyscript is failing for older versions of python3 such as python 3.5. Two issues observed with python 3.5 are ...1. Python 3 versions prior to 3.6 do not support the f-string format.
2. Early python 3 versions do not support the 'required' argument for the argparseadd_subparsers().Fix both of the above so that older versions of python 3 still work.
Signature · 2 lines
With best wishes Dmitry