diff options
| author | Rodrigo Vivi <[email protected]> | 2022-04-21 17:44:55 +0000 |
|---|---|---|
| committer | Rodrigo Vivi <[email protected]> | 2022-04-21 17:48:26 +0000 |
| commit | e1e1f4e32594d117d9f90e7743d33a019139fc9f (patch) | |
| tree | 01bfc642ee798e3e9daedfdaecd168bec4a764b2 /drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | |
| parent | drm/i915/selftests: tweak the misaligned_case (diff) | |
| parent | Merge tag 'drm-intel-next-2022-04-13-1' of git://anongit.freedesktop.org/drm/... (diff) | |
| download | kernel-e1e1f4e32594d117d9f90e7743d33a019139fc9f.tar.gz kernel-e1e1f4e32594d117d9f90e7743d33a019139fc9f.zip | |
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 <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h')
0 files changed, 0 insertions, 0 deletions