]> 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)
commit9f4ead16ababcd80ef3bed97fbeb73f491eb13ab
tree6d7e19bd3345bd43e3488d17f6cb60ff16289b3d
parent0f0ca26838b01495a889a61a3d35d895ea8ef584
parent35207211a670e932d7bc85a4c09a5f30fb35fa80
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