diff options
| author | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2024-04-23 14:11:14 +0200 |
|---|---|---|
| committer | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2024-04-24 10:25:51 +0200 |
| commit | 06e7139a034f26804904368fe4af2ceb70724756 (patch) | |
| tree | 229e9bea6a5d9898d4590af918b3d61f3e8c8bb2 /tools/lib/python | |
| parent | 869e54d4d54b1b0ee16c98c2149f5785eea08c02 (diff) | |
drm/xe: Fix unexpected backmerge results
The recent backmerge from drm-next to drm-xe-next brought with it
some silent unexpected results. One code snippet was added twice
and a partial revert had merge errors. Fix that up to
reinstate the affected code as it was before the backmerge.
v2:
- Commit log message rewording (Lucas DeMarchi)
Fixes: 79790b6818e9 ("Merge drm/drm-next into drm-xe-next")
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240423121114.39325-1-thomas.hellstrom@linux.intel.com
Diffstat (limited to 'tools/lib/python')
0 files changed, 0 insertions, 0 deletions