diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-10-24 09:50:22 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-10-24 09:50:22 +0100 |
| commit | a1c613ae4c322ddd58d5a8539dbfba2a0380a8c0 (patch) | |
| tree | b8b922dbb71fbd5591d01203eda85db3dd04df70 /tools/perf/scripts/python/exported-sql-viewer.py | |
| parent | 7eeaedf79989a8f131939782832e21e9218ed2a0 (diff) | |
| parent | 11ae5eb516b656e8a0e4efbea90ea24c152a346d (diff) | |
Merge drm/drm-next into drm-intel-gt-next
Work that needs to land in drm-intel-gt-next depends on two patches only
present in drm-intel-next, absence of which is causing a merge conflict:
3b918f4f0c8b ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS")
ac765b7018f6 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'tools/perf/scripts/python/exported-sql-viewer.py')
0 files changed, 0 insertions, 0 deletions