diff options
author | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-08-16 20:05:54 +0300 |
---|---|---|
committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-08-16 20:33:54 +0300 |
commit | ed7171ff9fabc49ae6ed42fbd082a576473836fc (patch) | |
tree | 62bc21b9b590a7fefb27b6103a121f4386e1815f /tools/perf/scripts/python/parallel-perf.py | |
parent | db3461a7743817ad7c73553902231b096616813a (diff) | |
parent | a809b92ee0f84c3f655b16a8b4d04bc3665d954a (diff) | |
download | linux-ed7171ff9fabc49ae6ed42fbd082a576473836fc.tar.xz |
Merge drm/drm-next into drm-xe-next
Get drm-xe-next on v6.11-rc2 and synchronized with drm-intel-next for
the display side. This resolves the current conflict for the
enable_display module parameter and allows further pending refactors.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Diffstat (limited to 'tools/perf/scripts/python/parallel-perf.py')
-rwxr-xr-x | tools/perf/scripts/python/parallel-perf.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/parallel-perf.py b/tools/perf/scripts/python/parallel-perf.py index 21f32ec5ed46..be85fd7f6632 100755 --- a/tools/perf/scripts/python/parallel-perf.py +++ b/tools/perf/scripts/python/parallel-perf.py @@ -439,7 +439,8 @@ def ProcessCommandOutputLines(cmd, per_cpu, fn, *x): pat = re.compile(r"\s*\[[0-9]+\]") p = subprocess.Popen(cmd, stdout=subprocess.PIPE) while True: - if line := p.stdout.readline(): + line = p.stdout.readline() + if line: line = line.decode("utf-8") if pat.match(line): line = line.split() |