]> git.baikalelectronics.ru Git - kernel.git/commit
Merge drm/drm-next into drm-intel-next
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 12 Oct 2021 16:03:58 +0000 (12:03 -0400)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 12 Oct 2021 16:03:58 +0000 (12:03 -0400)
commit98524b448922ec01700db0b3697dc856aa3c4bba
tree6d7e19bd3345bd43e3488d17f6cb60ff16289b3d
parent997afdb147cdbe755325bcfc4494b046bc004d03
parent6c599ae0f020f8661a62874c2d5403df540a6711
Merge drm/drm-next into drm-intel-next

Need to resync drm-intel-next with TTM and PXP stuff from
drm-intel-gt-next that is now in drm/drm-next.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_display_types.h
drivers/gpu/drm/i915/i915_reg.h