]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 6 Dec 2016 09:26:30 +0000 (10:26 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 6 Dec 2016 09:26:48 +0000 (10:26 +0100)
commit75e75cbd55183ff12459666c0a1d3e71fe1481ab
treea1dc32cc055770736397f9cf9b68f9e176184943
parent58309befa82d81f6e9dc36a92d2a339ef2144535
parent197aa6ed522cc44710687d3b02dd4e4573991416
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next

Backmerge v4.9-rc8 to get at

commit e94bd1736f1f60e916a85a80c0b0ebeaae36cce5
Author: Michel Dänzer <michel.daenzer@amd.com>
Date:   Wed Nov 30 17:30:01 2016 +0900

drm: Don't call drm_for_each_crtc with a non-KMS driver

so I can apply Michel's follow-up patch.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/dce_virtual.c
drivers/gpu/drm/mediatek/mtk_dsi.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/sun4i/sun4i_rgb.c
drivers/gpu/drm/tilcdc/tilcdc_panel.c