Just FYI this conflictted pretty heavily with drm-misc-next changes in the same area, someone should check drm-tip has the correct resolution, I'm not really sure what is definitely should be.
FWIW, this looks rather messy now. The drm-tip doesn't build. There was a new call to samsung_dsim_set_stop_state() introduced in commit b2fe2292624ac (drm: bridge: samsung-dsim: enter display mode in the enable() callback). Also merge commit 663a907e199b (Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip) is broken because it completely removes samsung_dsim_atomic_disable(). Dunno whats going on there. I'm just about to look at getting it to compile again and I'm trying to retest it. -michael
