| commit | e1e1f4e32594d117d9f90e7743d33a019139fc9f | [log] [tgz] |
|---|---|---|
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | Thu Apr 21 13:44:55 2022 -0400 |
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | Thu Apr 21 13:48:26 2022 -0400 |
| tree | 01bfc642ee798e3e9daedfdaecd168bec4a764b2 | |
| parent | 0f9fc0c1eff0120403f95d4f61e330654fbe64ed [diff] | |
| parent | c54b39a565227538c52ead2349eb17d54aadd6f7 [diff] |
Merge drm/drm-next into drm-intel-gt-next
In order to get the GSC Support merged on drm-intel-gt-next
in a clean fashion we needed this ATS-M patch to avoid
conflict in i915_pci.c:
commit 412c942bdfae ("drm/i915/ats-m: add ATS-M platform info")
--
Fixing a silent conflict on drivers/gpu/drm/i915/gt/intel_gt_gmch.c:
- if (!intel_vtd_active(i915))
+ if (!i915_vtd_active(i915))
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>