]> git.baikalelectronics.ru Git - kernel.git/commit
Merge airlied/drm-next into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 10 Aug 2017 16:12:01 +0000 (18:12 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 10 Aug 2017 16:12:01 +0000 (18:12 +0200)
commit8b62f6a1097b91e4a83afe09421af4ffe0287d19
tree3f42609b3e7f53eb81830c976fadde1d7bc36a2c
parentc3daaec45d4dd2abd8be95f59cae9276ff89a869
parente94209888d57da640784f88d1b6b4da14bcd9a06
Merge airlied/drm-next into drm-intel-next-queued

Ben Widawsky/Daniel Stone need the extended modifier support from
drm-misc to be able to merge CCS support for i915.ko

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_fbdev.c
drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/i915/intel_sprite.c